Pep8 updates for E265

Change-Id: I0875ce5eef2652fab044b4e26d6aa4a28d2751d5

Author: Neil Williams

lava/dispatcher/commands.py

@@ -59,7 +59,7 @@ def run_legacy_job(job_data, oob_file, config, output_dir, validate):
     json_job_data = json.dumps(job_data)
     job = LavaTestJob(json_job_data, oob_file, config, output_dir)
 
-    #FIXME Return status
+    # FIXME Return status
     if validate:
         try:
             validate_job_data(job.job_data)

lava/dispatcher/node.py

@@ -370,8 +370,8 @@ def request_wait_all(self, messageID, role=None):
         # of a broken test definition.
         if role:
             return self._send({"request": "lava_wait_all",
-                              "messageID": messageID,
-                              "waitrole": role})
+                               "messageID": messageID,
+                               "waitrole": role})
         else:
             return self._send({"request": "lava_wait_all",
                               "messageID": messageID})

lava_dispatcher/actions/deploy.py

@@ -27,26 +27,26 @@ class cmd_deploy_linaro_image(BaseAction):
     # json_schema_validation that means it doesn't work (see
     # https://github.com/zyga/json-schema-validator/pull/6).
 
-    ## parameters_schema = {
-    ##     'type': [
-    ##         {
-    ##             'type': 'object',
-    ##             'properties': {
-    ##                 'image': {'type': 'string'},
-    ##                 },
-    ##             'additionalProperties': False,
-    ##             },
-    ##         {
-    ##             'type': 'object',
-    ##             'properties': {
-    ##                 'hwpack': {'type': 'string'},
-    ##                 'rootfs': {'type': 'string'},
-    ##                 'rootfstype': {'type': 'string', 'optional': True, 'default': 'ext3'},
-    ##                 },
-    ##             'additionalProperties': False,
-    ##             },
-    ##         ],
-    ##     }
+    # parameters_schema = {
+    #     'type': [
+    #         {
+    #             'type': 'object',
+    #             'properties': {
+    #                 'image': {'type': 'string'},
+    #                 },
+    #             'additionalProperties': False,
+    #             },
+    #         {
+    #             'type': 'object',
+    #             'properties': {
+    #                 'hwpack': {'type': 'string'},
+    #                 'rootfs': {'type': 'string'},
+    #                 'rootfstype': {'type': 'string', 'optional': True, 'default': 'ext3'},
+    #                 },
+    #             'additionalProperties': False,
+    #             },
+    #         ],
+    #     }
 
     parameters_schema = {
         'type': 'object',

lava_dispatcher/actions/launch_control.py

@@ -48,8 +48,8 @@ def _get_dashboard(server, token):
     if not server.endswith("/"):
         server = ''.join([server, "/"])
 
-    #add backward compatible for 'dashboard/'-end URL
-    #Fix it: it's going to be deleted after transition
+    # add backward compatible for 'dashboard/'-end URL
+    # Fix it: it's going to be deleted after transition
     if server.endswith("dashboard/"):
         server = ''.join([server, "xml-rpc/"])
         logging.warn("Please use whole endpoint URL not just end with 'dashboard/', "
@@ -80,7 +80,7 @@ def _get_dashboard(server, token):
         logging.error("Please use RPC2 endpoint instead, xml-rpc is no longer supported")
         raise OperationFailed("xml-rpc endpoint is not supported.")
     elif server.endswith("RPC2/"):
-        #include lava-server/RPC2/
+        # include lava-server/RPC2/
         dashboard = srv.dashboard
     else:
         logging.warn("The url seems not RPC2 or xml-rpc endpoints, please make sure it's a valid one!!!")

lava_dispatcher/actions/lava_android_test.py

@@ -50,7 +50,7 @@ def test_name(self, test_name, option=None, timeout=-1):
         return super(cmd_lava_android_test_run, self).test_name() + ' (%s)' % test_name
 
     def run(self, test_name, option=None, timeout=-1):
-        #Make sure in test image now
+        # Make sure in test image now
         self.check_lava_android_test_installed()
         with self.client.android_tester_session() as session:
             bundle_name = generate_bundle_file_name(test_name)
@@ -110,7 +110,7 @@ def run(self, commands=None, command_file=None, parser=None, timeout=-1):
         :param parser:  The parser to use for the test
         :param timeout: The timeout to apply.
         """
-        #Make sure in test image now
+        # Make sure in test image now
         self.check_lava_android_test_installed()
         if commands or command_file:
             with self.client.android_tester_session() as session:
@@ -168,7 +168,7 @@ def test_name(self, url=None, timeout=-1):
         return '%s (url=[%s])' % (super(cmd_lava_android_test_run_monkeyrunner, self).test_name(), url)
 
     def run(self, url=None, timeout=-1):
-        #Make sure in test image now
+        # Make sure in test image now
         self.check_lava_android_test_installed()
         with self.client.android_tester_session() as session:
             bundle_name = generate_bundle_file_name('monkeyrunner')

lava_dispatcher/actions/lava_test.py

@@ -28,9 +28,9 @@
 
 
 def _install_lava_test(client, session):
-    #install bazaar in tester image
+    # install bazaar in tester image
     session.run('%s update' % client.aptget_cmd)
-    #Install necessary packages for build lava-test
+    # Install necessary packages for build lava-test
     cmd = ('%s -y --force-yes install '
            'bzr usbutils python-apt python-setuptools '
            'python-simplejson lsb-release python-keyring '
@@ -49,7 +49,7 @@ def _install_lava_test(client, session):
         logging.debug("Installing %s with pip" % lava_test_url)
         session.run('pip install -e ' + lava_test_url)
 
-    #Test if lava-test installed
+    # Test if lava-test installed
     session.run('which lava-test', timeout=60)
 
     # cleanup the lava-test - old results, cached files...
@@ -205,11 +205,11 @@ class cmd_add_apt_repository(BaseAction):
     def run(self, arg):
         with self.client.reliable_session() as session:
 
-            #install add-apt-repository
+            # install add-apt-repository
             session.run('%s -y install python-software-properties' %
                         self.client.aptget_cmd)
 
-            #add ppa
+            # add ppa
             for repository in arg:
                 session.run('add-apt-repository %s < /dev/null' % repository)
             session.run('%s update' % self.client.aptget_cmd)

lava_dispatcher/actions/lava_test_shell.py

@@ -243,7 +243,7 @@ def _get_testdef_url_repo(testdef_repo, context, tmpdir):
         if not os.path.isdir(urldir):
             logging.info("Creating directory to download the url file into.")
             os.makedirs(urldir)
-        #we will not use 'testdef_file' here, we can get this info from URL
+        # we will not use 'testdef_file' here, we can get this info from URL
         testdef_file = download_image(testdef_repo, context, urldir)
 
     except Exception as e:
@@ -679,19 +679,19 @@ class cmd_lava_test_shell(BaseAction):
                               'items': {'type': 'object',
                                         'properties':
                                         {'git-repo': {'type': 'string',
-                                                'optional': True},
+                                                      'optional': True},
                                          'bzr-repo': {'type': 'string',
-                                                'optional': True},
+                                                      'optional': True},
                                          'tar-repo': {'type': 'string',
-                                                'optional': True},
+                                                      'optional': True},
                                          'url': {'type': 'string',
-                                                'optional': True},
+                                                 'optional': True},
                                          'revision': {'type': 'string',
-                                                'optional': True},
+                                                      'optional': True},
                                          'testdef': {'type': 'string',
-                                                'optional': True},
+                                                     'optional': True},
                                          'parameters': {'type': 'object',
-                                                'optional': True}
+                                                        'optional': True}
                                          },
                                         'additionalProperties': False},
                               'optional': True

lava_dispatcher/actions/lmp/board.py

@@ -126,7 +126,7 @@ def get_frame(self):
 
         logging.debug("LMP: Got %s" % response)
 
-        #return a Python object
+        # return a Python object
         return json.loads(response)
 
     def get_response(self, schema):

lava_dispatcher/actions/lmp/init_boards.py

@@ -75,7 +75,7 @@ def _validate_lmp_module(lmp_module_data):
     Validator.validate(schema, lmp_module_data)
 
 
-#init LMP module
+# init LMP module
 def init(lmp_module_data, config):
     _validate_lmp_module(lmp_module_data)
     for lmp_module_element in lmp_module_data:

lava_dispatcher/actions/lmp/signals.py

@@ -28,7 +28,7 @@
 from lava_dispatcher.actions.lmp.board import get_module_serial
 
 
-#for LMP signal process
+# for LMP signal process
 def lsgpio_signal(connection, config, command, module_name):
     message_str = ""
     gpio_value = ""
@@ -110,7 +110,7 @@ def hdmi_signal(connection, config, command, module_name, fakeedid=None):
         elif command == "disconnect":
             lmp_hdmi.disconnect(lmp_hdmi_id)
         elif command == "fakeedid":
-            #FIXME: How to pass the fake edid to target board?
+            # FIXME: How to pass the fake edid to target board?
             lmp_hdmi.fake(lmp_hdmi_id)
         elif command[:3] == "id_":
             lmp_hdmi.set_identify(lmp_hdmi_id, command[-3:])

lava_dispatcher/client/base.py

@@ -229,15 +229,15 @@ def _setup_adb_over_tcp(self):
         if self.dev_ip is None:
             raise OperationFailed("failed to get board ip address")
         try:
-            ## just disconnect the adb connection in case is remained
-            ## by last action or last job
-            ## that connection should be expired already
+            # just disconnect the adb connection in case is remained
+            # by last action or last job
+            # that connection should be expired already
             self.android_adb_over_tcp_disconnect()
         except KeyboardInterrupt:
             raise KeyboardInterrupt
         except:
-            ## ignore all exception
-            ## this just in case of exception
+            # ignore all exception
+            # this just in case of exception
             pass
         self.android_adb_over_tcp_connect()
         self.wait_until_attached()
@@ -321,7 +321,7 @@ def wait_until_attached(self):
     def wait_home_screen(self):
         timeout = self._client.config.android_home_screen_timeout
         activity_pat = self._client.config.android_wait_for_home_screen_activity
-        #waiting for the home screen displayed
+        # waiting for the home screen displayed
         try:
             self.run('logcat -s ActivityManager:I',
                      response=[activity_pat],
@@ -331,9 +331,9 @@ def wait_home_screen(self):
             logging.critical(msg)
             raise CriticalError(msg)
         finally:
-            #send ctrl+c to exit the logcat command,
-            #and make the latter command can be run on the normal
-            #command line session, instead of the session of logcat command
+            # send ctrl+c to exit the logcat command,
+            # and make the latter command can be run on the normal
+            # command line session, instead of the session of logcat command
             self._connection.sendcontrol("c")
             self.run('')
 
@@ -625,7 +625,7 @@ def boot_linaro_android_image(self, adb_check=False):
             self.context.test_data.add_metadata(boottime_meta)
             logging.debug("Kernel boot time: %s seconds" % boottime)
 
-            #TODO: set up proxy
+            # TODO: set up proxy
 
             if not self.config.android_adb_over_usb:
                 try:
@@ -671,8 +671,8 @@ def boot_linaro_android_image(self, adb_check=False):
             logging.critical(msg)
             raise CriticalError(msg)
 
-        #check if the adb connection can be created.
-        #by adb connect dev_ip command
+        # check if the adb connection can be created.
+        # by adb connect dev_ip command
         if adb_check:
             try:
                 session = AndroidTesterCommandRunner(self)

lava_dispatcher/device/dynamic_vm.py

@@ -51,7 +51,7 @@ def __init__(self, context, config):
         super(DynamicVmTarget, self).__init__(context, config)
 
         device_type = config.dynamic_vm_backend_device_type
-        if not device_type in self.supported_backends.keys():
+        if device_type not in self.supported_backends.keys():
             raise CriticalError("%s is not supported as a backend" %
                                 device_type)
 

lava_dispatcher/device/fastmodel.py

@@ -97,7 +97,7 @@ def _customize_android(self):
         with image_partition_mounted(self._sd_image, self.SYS_PARTITION) as d:
             with open('%s/etc/mkshrc' % d, 'a') as f:
                 f.write('\n# LAVA CUSTOMIZATIONS\n')
-                #make sure PS1 is what we expect it to be
+                # make sure PS1 is what we expect it to be
                 f.write('PS1="%s"\n' % self.tester_ps1)
                 if not self.config.enable_network_after_boot_android:
                     # fast model usermode networking does not support ping

lava_dispatcher/device/master.py

@@ -350,7 +350,7 @@ def extract_tarball(self, tarball_url, partition, directory='/'):
     @contextlib.contextmanager
     def file_system(self, partition, directory):
         logging.info('attempting to access master filesystem %r:%s' %
-                    (partition, directory))
+                     (partition, directory))
 
         assert directory != '/', "cannot mount entire partition"
 
@@ -476,7 +476,7 @@ def _android_data_label(self, session):
         data_label = self.userdata_label
         data_path = self.userdata_path
         if not session.has_partition_with_label(data_label):
-            #consider the compatiblity, here use the existed sdcard partition
+            # consider the compatiblity, here use the existed sdcard partition
             data_label = self.sdcard_label
             data_path = self.sdcard_path
         return data_label, data_path
@@ -522,9 +522,9 @@ def _deploy_linaro_rootfs(self, session, rootfs):
         # another hour to err on the side of caution.
         session._client.target_extract(session, rootfs, '/mnt/root', timeout=18000)
 
-        #DO NOT REMOVE - diverting flash-kernel and linking it to /bin/true
-        #prevents a serious problem where packages getting installed that
-        #call flash-kernel can update the kernel on the master image
+        # DO NOT REMOVE - diverting flash-kernel and linking it to /bin/true
+        # prevents a serious problem where packages getting installed that
+        # call flash-kernel can update the kernel on the master image
         if session.run('chroot /mnt/root which dpkg-divert', failok=True) == 0:
             session.run(
                 'chroot /mnt/root dpkg-divert --local /usr/sbin/flash-kernel')

lava_dispatcher/device/target.py

@@ -433,13 +433,13 @@ def _boot_cmds_preprocessing(self, boot_cmds):
         (1)Delete the redundant element "" at the end of boot_cmds
         (2)(we can add more actions for preprocessing here).
         """
-        #Delete the redundant element "" at the end of boot_cmds
+        # Delete the redundant element "" at the end of boot_cmds
         while True:
             if boot_cmds[-1] == "":
                 del boot_cmds[-1]
             else:
                 break
-        #we can add more actions here
+        # we can add more actions here
         logging.debug('boot_cmds(after preprocessing): %s', boot_cmds)
         return boot_cmds
 
@@ -713,8 +713,8 @@ def _get_from_config_or_deployment_data(self, key):
 
     def _customize_linux(self):
         # XXX Re-examine what to do here in light of deployment_data import.
-        #perhaps make self.deployment_data = deployment_data({overrides: dict})
-        #and remove the write function completely?
+        # perhaps make self.deployment_data = deployment_data({overrides: dict})
+        # and remove the write function completely?
 
         os_release_id = 'linux'
         mnt = self.mount_info['rootfs']
@@ -795,7 +795,7 @@ def _reorganize_customize_files(self):
                 if des_tmp[:5] != "boot:" and des_tmp[:7] != "rootfs:" and des_tmp != "delete":
                     logging.error('Customize function only support <boot, rootfs>:<path> as image path, for now!')
                     raise CriticalError("Unrecognized image path %s, Please check your test definition!" % des_tmp)
-                    #temp_dic["des"].remove(des_tmp)
+                    # temp_dic["des"].remove(des_tmp)
             if src[:4] in image_part:
                 if "delete" in temp_dic["des"]:
                     customize_info["delete"].append(src)