Merge "Fixes remaining pep8 issues"

cafe/common/reporting/metrics.py

@@ -134,7 +134,7 @@ class CSVWriter(object):
             try:
                 os.remove(self.full_path)
             except OSError:
-                sys.stderr.write('File not writable\n')                
+                sys.stderr.write('File not writable\n')
 
         if os.path.exists(self.full_path) is False:
             ''' Write out the header to the stats log '''
@@ -148,7 +148,7 @@ class CSVWriter(object):
             try:
                 csv_writer.writerow(row_list)
             except OSError:
-                sys.stderr.write('File not writable\n')                
+                sys.stderr.write('File not writable\n')
             fp.close()
 
 

cafe/drivers/pyvows/runner.py

@@ -54,10 +54,8 @@ def entry_point():
     product_root_test_path = os.path.join(
         test_env_manager.test_repo_path, product)
 
-
     # Attempts to use first positional argument after product config as a
     # sub-path to the test repo path. If not a sub-path, raise exception.
-
     if vows_opts and not vows_opts[0].startswith('-'):
         user_provided_path = vows_opts[0]
         attempted_sub_path = os.path.join(

cafe/engine/behaviors.py

@@ -61,7 +61,7 @@ def behavior(*required_clients):
                                      else "instances")
                     msg = ("Behavior {0} expected {1} of {2} but couldn't"
                            " find one".format(
-                           func, msg_plurality, missing_clients))
+                               func, msg_plurality, missing_clients))
                     raise RequiredClientNotDefinedError(msg)
             return func(self, *args, **kwargs)
         return _wrap

cafe/engine/models/ssh_response.py

@@ -17,5 +17,5 @@ limitations under the License.
 from warnings import warn, simplefilter
 simplefilter("default", DeprecationWarning)
 warn("cafe.engine.models.ssh_response has been moved to "
-    "cafe.engine.ssh.models.ssh_response", DeprecationWarning)
-from cafe.engine.ssh.models.ssh_response import SSHKeyResponse, ExecResponse
+     "cafe.engine.ssh.models.ssh_response", DeprecationWarning)
+from cafe.engine.ssh.models.ssh_response import SSHKeyResponse, ExecResponse

plugins/skip_on_issue/cafe/resources/launchpad/issue_tracker.py

@@ -48,4 +48,3 @@ class LaunchpadTracker(object):
         log.info('Bug does not affect project {0} '
                  'or project name is not correct.'.format(config.project))
         return False
-