CSIT-360: Fix: Parallel test sets run. 80/2980/2
authorMatej Klotton <mklotton@cisco.com>
Tue, 20 Sep 2016 13:32:28 +0000 (15:32 +0200)
committerMiroslav Miklus <mmiklus@cisco.com>
Wed, 21 Sep 2016 09:37:02 +0000 (09:37 +0000)
- fix typos

Change-Id: I5292b27ae584c86cb4986df5439bdebd5fa40b67
Signed-off-by: Matej Klotton <mklotton@cisco.com>
resources/libraries/python/SetupFramework.py

index d035317..7914d7c 100644 (file)
@@ -38,11 +38,11 @@ def pack_framework_dir():
 
     try:
         directory = environ["TMPDIR"]
-    except Keyerror:
+    except KeyError:
         directory = None
 
     if directory is not None:
-        tmpfile = NamedTemporaryFile(suffix=".tgz", prefix="openvpp-testing-",\
+        tmpfile = NamedTemporaryFile(suffix=".tgz", prefix="openvpp-testing-",
                                      dir="{0}".format(directory))
     else:
         tmpfile = NamedTemporaryFile(suffix=".tgz", prefix="openvpp-testing-")
@@ -83,7 +83,7 @@ def copy_tarball_to_node(tarball, node):
 def extract_tarball_at_node(tarball, node):
     """Extract tarball at given node.
 
-    Extracts tarball using tar on given node to specific CSIT loocation.
+    Extracts tarball using tar on given node to specific CSIT location.
 
     :param tarball: Path to tarball to upload.
     :param node: Dictionary created from topology.
@@ -112,7 +112,8 @@ def create_env_directory_at_node(node):
     ssh = SSH()
     ssh.connect(node)
     (ret_code, stdout, stderr) = ssh.exec_command(
-        'cd {0} && rm -rf env && virtualenv --system-site-packages env && . env/bin/activate && '
+        'cd {0} && rm -rf env && virtualenv --system-site-packages env && '
+        '. env/bin/activate && '
         'pip install -r requirements.txt'
         .format(con.REMOTE_FW_DIR), timeout=100)
     if 0 != ret_code:
@@ -121,7 +122,8 @@ def create_env_directory_at_node(node):
     else:
         logger.console('Virtualenv created on {0}'.format(node['host']))
 
-#pylint: disable=broad-except
+
+# pylint: disable=broad-except
 def setup_node(args):
     """Run all set-up methods for a node.
 
@@ -147,6 +149,7 @@ def setup_node(args):
         logger.console('Setup of node {0} done'.format(node['host']))
         return True
 
+
 def delete_local_tarball(tarball):
     """Delete local tarball to prevent disk pollution.
 
@@ -157,7 +160,7 @@ def delete_local_tarball(tarball):
     call(split('sh -c "rm {0} > /dev/null 2>&1"'.format(tarball)))
 
 
-class SetupFramework(object): # pylint: disable=too-few-public-methods
+class SetupFramework(object):  # pylint: disable=too-few-public-methods
     """Setup suite run on topology nodes.
 
     Many VAT/CLI based tests need the scripts at remote hosts before executing