fix(pep8): Fix various pep8 violations and version-lock pep8

Fixed all complaints from running "make pep8". Also version locked
pep8 in test-requirements.txt to ensure that pep8 requirements don't
change without an explicit commit.

6 files changed, 10 insertions, 10 deletions

diff --git a/tests/unittests/test_datasource/test_azure.py b/tests/unittests/test_datasource/test_azure.py
index 88c82d5e..e992a006 100644
--- a/tests/unittests/test_datasource/test_azure.py
+++ b/tests/unittests/test_datasource/test_azure.py
@@ -235,7 +235,7 @@ class TestAzureDataSource(MockerTestCase):
         self.assertEqual(dsrc.userdata_raw, mydata)
 
     def test_no_datasource_expected(self):
-        #no source should be found if no seed_dir and no devs
+        # no source should be found if no seed_dir and no devs
         data = {}
         dsrc = self._get_ds({})
         ret = dsrc.get_data()
diff --git a/tests/unittests/test_datasource/test_nocloud.py b/tests/unittests/test_datasource/test_nocloud.py
index 14274562..8bcc026c 100644
--- a/tests/unittests/test_datasource/test_nocloud.py
+++ b/tests/unittests/test_datasource/test_nocloud.py
@@ -50,7 +50,7 @@ class TestNoCloudDataSource(MockerTestCase):
         self.assertTrue(ret)
 
     def test_fs_label(self):
-        #find_devs_with should not be called ff fs_label is None
+        # find_devs_with should not be called ff fs_label is None
         ds = DataSourceNoCloud.DataSourceNoCloud
 
         class PsuedoException(Exception):
@@ -74,7 +74,7 @@ class TestNoCloudDataSource(MockerTestCase):
         self.assertFalse(ret)
 
     def test_no_datasource_expected(self):
-        #no source should be found if no cmdline, config, and fs_label=None
+        # no source should be found if no cmdline, config, and fs_label=None
         sys_cfg = {'datasource': {'NoCloud': {'fs_label': None}}}
 
         ds = DataSourceNoCloud.DataSourceNoCloud
diff --git a/tests/unittests/test_distros/test_generic.py b/tests/unittests/test_distros/test_generic.py
index c24c790e..a972568f 100644
--- a/tests/unittests/test_distros/test_generic.py
+++ b/tests/unittests/test_distros/test_generic.py
@@ -193,7 +193,7 @@ class TestGenericDistro(helpers.FilesystemMockingTestCase):
                           'security': 'http://security-mirror2-intel'})
 
 
-#def _get_package_mirror_info(mirror_info, availability_zone=None,
+# def _get_package_mirror_info(mirror_info, availability_zone=None,
 #                             mirror_filter=util.search_for_mirror):
 
 
diff --git a/tests/unittests/test_handler/test_handler_growpart.py b/tests/unittests/test_handler/test_handler_growpart.py
index f6dc4521..fa624197 100644
--- a/tests/unittests/test_handler/test_handler_growpart.py
+++ b/tests/unittests/test_handler/test_handler_growpart.py
@@ -53,7 +53,7 @@ class TestDisabled(MockerTestCase):
         self.handle = cc_growpart.handle
 
     def test_mode_off(self):
-        #Test that nothing is done if mode is off.
+        # Test that nothing is done if mode is off.
 
         # this really only verifies that resizer_factory isn't called
         config = {'growpart': {'mode': 'off'}}
@@ -109,7 +109,7 @@ class TestConfig(MockerTestCase):
         self.assertTrue(isinstance(ret, cc_growpart.ResizeGrowPart))
 
     def test_handle_with_no_growpart_entry(self):
-        #if no 'growpart' entry in config, then mode=auto should be used
+        # if no 'growpart' entry in config, then mode=auto should be used
 
         myresizer = object()
 
@@ -141,7 +141,7 @@ class TestResize(MockerTestCase):
         self.mocker.order()
 
     def test_simple_devices(self):
-        #test simple device list
+        # test simple device list
         # this patches out devent2dev, os.stat, and device_part_info
         # so in the end, doesn't test a lot
         devs = ["/dev/XXda1", "/dev/YYda2"]
@@ -187,7 +187,7 @@ class TestResize(MockerTestCase):
                              find("/dev/YYda2", resized)[1])
             self.assertEqual(cc_growpart.RESIZE.SKIPPED,
                              find(enoent[0], resized)[1])
-            #self.assertEqual(resize_calls,
+            # self.assertEqual(resize_calls,
             #                 [("/dev/XXda", "1", "/dev/XXda1"),
             #                  ("/dev/YYda", "2", "/dev/YYda2")])
         finally:
diff --git a/tests/unittests/test_handler/test_handler_power_state.py b/tests/unittests/test_handler/test_handler_power_state.py
index 4b7b2112..2f86b8f8 100644
--- a/tests/unittests/test_handler/test_handler_power_state.py
+++ b/tests/unittests/test_handler/test_handler_power_state.py
@@ -67,7 +67,7 @@ def check_lps_ret(psc_return, mode=None):
     cmd = psc_return[0]
     timeout = psc_return[1]
 
-    if not 'shutdown' in psc_return[0][0]:
+    if 'shutdown' not in psc_return[0][0]:
         errs.append("string 'shutdown' not in cmd")
 
     if mode is not None:
diff --git a/tests/unittests/test_handler/test_handler_yum_add_repo.py b/tests/unittests/test_handler/test_handler_yum_add_repo.py
index 156441c7..21b89c34 100644
--- a/tests/unittests/test_handler/test_handler_yum_add_repo.py
+++ b/tests/unittests/test_handler/test_handler_yum_add_repo.py
@@ -24,7 +24,7 @@ class TestConfig(helpers.FilesystemMockingTestCase):
                 'epel-testing': {
                     'name': 'Extra Packages for Enterprise Linux 5 - Testing',
                     # Missing this should cause the repo not to be written
-                    #'baseurl': 'http://blah.org/pub/epel/testing/5/$basearch',
+                    # 'baseurl': 'http://blah.org/pub/epel/testing/5/$basearch',
                     'enabled': False,
                     'gpgcheck': True,
                     'gpgkey': 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL',