summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJose Lausuch <jose.lausuch@ericsson.com>2017-03-29 22:56:48 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-03-29 22:56:48 +0000
commit792ecc29222604124a3da02b64aca7bae81207d2 (patch)
treeefaaf151ac1d5c67a912e58c8c79c040d969e3b1
parenta8ac0683dc4accfc4d300de20071989c0d1ffb63 (diff)
parentb39bf106d41bcf41fd20ec2f6b1387bad4c23095 (diff)
Merge "Prepare run_tests to be called directly to main()"
-rw-r--r--sdnvpn/test/functest/run_tests.py19
1 files changed, 9 insertions, 10 deletions
diff --git a/sdnvpn/test/functest/run_tests.py b/sdnvpn/test/functest/run_tests.py
index 1130759..140aee2 100644
--- a/sdnvpn/test/functest/run_tests.py
+++ b/sdnvpn/test/functest/run_tests.py
@@ -20,13 +20,7 @@ import functest.utils.functest_utils as ft_utils
from sdnvpn.lib import config as sdnvpn_config
-parser = argparse.ArgumentParser()
-parser.add_argument("-r", "--report",
- help="Create json result file",
- action="store_true")
-args = parser.parse_args()
-
-logger = ft_logger.Logger("sdnvpn-run-tests").getLogger()
+logger = ft_logger.Logger(__name__).getLogger()
COMMON_CONFIG = sdnvpn_config.CommonConfig()
TEST_DB_URL = COMMON_CONFIG.test_db
@@ -42,7 +36,7 @@ def push_results(testname, start_time, end_time, criteria, details):
details)
-def main():
+def main(report=False):
# Workaround for https://jira.opnfv.org/projects/SDNVPN/issues/SDNVPN-100
# and SDNVPN-126
cmd_line = "neutron quota-update --subnet -1 --network -1 --port -1"
@@ -88,7 +82,7 @@ def main():
if status == "FAIL":
overall_status = "FAIL"
- if args.report:
+ if report:
push_results(
test_name_db, start_time, end_time, status, details)
@@ -99,4 +93,9 @@ def main():
if __name__ == '__main__':
- main()
+ parser = argparse.ArgumentParser()
+ parser.add_argument("-r", "--report",
+ help="Create json result file",
+ action="store_true")
+ args = parser.parse_args()
+ main(report=args.report)