Fix pylint errors in the new driver disk code.

Related: rhbz#1084197
rhinstaller · Jul 13, 2015 · 0b6aded · 0b6aded
1 parent 6e6ba58
commit 0b6aded
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/dracut/driver_updates.py b/dracut/driver_updates.py
@@ -75,7 +75,7 @@
 
 # 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
@@ -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 @@ def test_finish(self):
 '''
 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 @@ def test_finish(self):
     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 @@ def test_shortdev(self):
 # 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
@@ -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