summaryrefslogtreecommitdiffstats
path: root/robotframework-onap/loadtest
diff options
context:
space:
mode:
authorDR695H <dr695h@att.com>2019-05-01 18:52:33 -0400
committerDR695H <dr695h@att.com>2019-05-01 18:53:14 -0400
commitae6fedd18ad51f175d6a2e2346f284a68b6e4967 (patch)
tree40cf730e4178000533b83ebffdf6abe04011ce06 /robotframework-onap/loadtest
parent308b44cc1e6b95df3051e5f7db94389696763cca (diff)
support python 3
support python 3 in all files, also support python 2 however so everything should continue to work Change-Id: I4ace08d2bb0623c0fdc61f2fe39d2339817aa916 Issue-ID: TEST-141 Signed-off-by: DR695H <dr695h@att.com>
Diffstat (limited to 'robotframework-onap/loadtest')
-rw-r--r--robotframework-onap/loadtest/RunEte.py2
-rw-r--r--robotframework-onap/loadtest/TestMain.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/robotframework-onap/loadtest/RunEte.py b/robotframework-onap/loadtest/RunEte.py
index 5012e7d..0d5df84 100644
--- a/robotframework-onap/loadtest/RunEte.py
+++ b/robotframework-onap/loadtest/RunEte.py
@@ -34,6 +34,6 @@ class RunEte(Thread):
env = dict(os.environ, SOAKSUBFOLDER=self.soaksubfolder + "/")
output = subprocess.check_output(["bash", self.robot_command, self.robot_test, self.test_number], shell=False, env=env)
logging.info("{} ({}) {}".format(self.getName(), self.robot_test, output))
- except Exception, e:
+ except Exception as e:
logging.error("{} ({}) Unexpected error {}".format(self.getName(), self.robot_test, repr(e)))
logging.info("{} ({}) ended - {}".format(self.getName(), self.robot_test, str(datetime.now())))
diff --git a/robotframework-onap/loadtest/TestMain.py b/robotframework-onap/loadtest/TestMain.py
index 81c635f..3e8eb72 100644
--- a/robotframework-onap/loadtest/TestMain.py
+++ b/robotframework-onap/loadtest/TestMain.py
@@ -66,7 +66,7 @@ def main(argv=None):
controller = TestController(opts)
controller.execute()
- except Exception, e:
+ except Exception as e:
indent = len(program_name) * " "
sys.stderr.write(program_name + ": " + repr(e) + "\n")
sys.stderr.write(indent + " for help use --help")
@@ -75,7 +75,7 @@ def main(argv=None):
if __name__ == "__main__":
if DEBUG:
- print "debug"
+ print("debug")
if TESTRUN:
import doctest
doctest.testmod()