[PATCH rhel7-branch] Fix pylint errors in the new driver disk code.
Chris Lumens
clumens at redhat.com
Mon Jul 13 14:12:38 UTC 2015
Related: rhbz#1084197
---
dracut/driver_updates.py | 2 +-
tests/dracut_tests/test_driver_updates.py | 9 ++++-----
tests/testenv.sh | 4 ++--
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/dracut/driver_updates.py b/dracut/driver_updates.py
index 0bf9648..79410dd 100755
--- a/dracut/driver_updates.py
+++ b/dracut/driver_updates.py
@@ -75,7 +75,7 @@ from logging.handlers import SysLogHandler
# py2 compat
try:
- from subprocess import DEVNULL
+ from subprocess import DEVNULL # pylint: disable=no-name-in-module
except ImportError:
DEVNULL = open("/dev/null", 'a+')
try:
diff --git a/tests/dracut_tests/test_driver_updates.py b/tests/dracut_tests/test_driver_updates.py
index 9b87c73..0e47c76 100644
--- a/tests/dracut_tests/test_driver_updates.py
+++ b/tests/dracut_tests/test_driver_updates.py
@@ -2,7 +2,7 @@
import unittest
try:
- import unittest.mock as mock
+ import unittest.mock as mock # pylint: disable=import-error,no-name-in-module
except ImportError:
import mock
@@ -231,7 +231,7 @@ class TestSaveRepo(FileTestCaseBase):
def test_basic(self):
"""save_repo: copies a directory to /run/install/DD-X"""
makerepo(self.srcdir)
- [repo] = find_repos(self.srcdir)
+ repo = find_repos(self.srcdir)[0]
makefile(repo+'/fake-something.rpm')
saved = save_repo(repo, target=self.destdir)
self.assertEqual(set(os.listdir(saved)), set(["fake-something.rpm"]))
@@ -547,7 +547,7 @@ TYPE=ext4
'''
disk_labels = {
'/dev/sdb1': 'metroid_srv',
- '/dev/loop0': 'I\\x20\u262d\\x20COMMUNISM',
+ '/dev/loop0': u'I\\x20\u262d\\x20COMMUNISM',
'/dev/sda3': 'metroid_root'
}
devicelist = [
@@ -558,7 +558,7 @@ devicelist = [
DeviceInfo(DEVNAME='/dev/sda3', TYPE='btrfs', LABEL='metroid_root',
UUID='4126dbb6-c7d3-47b4-b1fc-9bb461df0067'),
DeviceInfo(DEVNAME='/dev/loop0', TYPE='ext4',
- LABEL='I\\x20\u262d\\x20COMMUNISM',
+ LABEL=u'I\\x20\u262d\\x20COMMUNISM',
UUID='6f16967e-0388-4276-bd8d-b88e5b217a55'),
]
# also covers blkid, get_disk_labels, DeviceInfo
@@ -584,7 +584,6 @@ class DeviceInfoTestCase(unittest.TestCase):
# TODO: test TextMenu itself
# py2/3 compat
-import sys
if sys.version_info.major == 3:
from io import StringIO
else:
diff --git a/tests/testenv.sh b/tests/testenv.sh
index 017559d..198b870 100644
--- a/tests/testenv.sh
+++ b/tests/testenv.sh
@@ -9,9 +9,9 @@ fi
: "${top_builddir:=$top_srcdir}"
if [ -z "$PYTHONPATH" ]; then
- PYTHONPATH="${top_builddir}/pyanaconda/isys/.libs:${top_srcdir}/pyanaconda:${top_srcdir}:${top_srcdir}/tests/lib"
+ PYTHONPATH="${top_builddir}/pyanaconda/isys/.libs:${top_srcdir}/pyanaconda:${top_srcdir}:${top_srcdir}/tests/lib:${top_srcdir}/dracut"
else
- PYTHONPATH="${PYTHONPATH}:${top_builddir}/pyanaconda/isys/.libs:${top_srcdir}/pyanaconda:${top_srcdir}:${top_srcdir}/tests/lib"
+ PYTHONPATH="${PYTHONPATH}:${top_builddir}/pyanaconda/isys/.libs:${top_srcdir}/pyanaconda:${top_srcdir}:${top_srcdir}/tests/lib:${top_srcdir}/dracut"
fi
if [ -z "$LD_LIBRARY_PATH" ]; then
--
2.4.3
More information about the anaconda-patches
mailing list