diff options
Diffstat (limited to 'qtip')
-rw-r--r-- | qtip/api/qtip_server.py | 2 | ||||
-rw-r--r-- | qtip/cli/commands/cmd_ansible.py | 1 | ||||
-rw-r--r-- | qtip/cli/commands/cmd_perftest.py | 1 | ||||
-rw-r--r-- | qtip/cli/commands/cmd_suite.py | 1 | ||||
-rw-r--r-- | qtip/cli/commands/cmd_version.py | 1 | ||||
-rw-r--r-- | qtip/runner/testplan.py (renamed from qtip/runner/test_plan.py) | 0 | ||||
-rw-r--r-- | qtip/utils/args_handler.py | 8 | ||||
-rw-r--r-- | qtip/utils/cli.py | 4 | ||||
-rw-r--r-- | qtip/utils/report/qtip_report.py (renamed from qtip/utils/report/Qtip_Report.py) | 1 |
9 files changed, 12 insertions, 7 deletions
diff --git a/qtip/api/qtip_server.py b/qtip/api/qtip_server.py index 9b9dd633..e2ee0d27 100644 --- a/qtip/api/qtip_server.py +++ b/qtip/api/qtip_server.py @@ -158,7 +158,7 @@ default is all benchmarks in suite with specified type, benchmarks = args_handler.get_files_in_suite(args["suite_name"], args["type"].lower()) - test_cases = args_handler.get_files_in_test_case(args["pod_name"], + test_cases = args_handler.get_files_in_test_plan(args["pod_name"], args["suite_name"], args["type"].lower()) benchmarks_list = filter(lambda x: x in test_cases, benchmarks) diff --git a/qtip/cli/commands/cmd_ansible.py b/qtip/cli/commands/cmd_ansible.py index 857e68e2..453fa331 100644 --- a/qtip/cli/commands/cmd_ansible.py +++ b/qtip/cli/commands/cmd_ansible.py @@ -36,6 +36,7 @@ class Ansible: def cli(): pass + _ansible = Ansible() diff --git a/qtip/cli/commands/cmd_perftest.py b/qtip/cli/commands/cmd_perftest.py index 5cfe4110..129ee2d9 100644 --- a/qtip/cli/commands/cmd_perftest.py +++ b/qtip/cli/commands/cmd_perftest.py @@ -44,6 +44,7 @@ def cli(): def perftest(ctx): pass + _perftest = PerfTest() diff --git a/qtip/cli/commands/cmd_suite.py b/qtip/cli/commands/cmd_suite.py index f6c839ba..45c739df 100644 --- a/qtip/cli/commands/cmd_suite.py +++ b/qtip/cli/commands/cmd_suite.py @@ -40,6 +40,7 @@ def cli(): def suite(ctx): pass + _suite = Suite() diff --git a/qtip/cli/commands/cmd_version.py b/qtip/cli/commands/cmd_version.py index b8779a72..7f093096 100644 --- a/qtip/cli/commands/cmd_version.py +++ b/qtip/cli/commands/cmd_version.py @@ -34,6 +34,7 @@ def cli(): def version(): pass + _version = Version() diff --git a/qtip/runner/test_plan.py b/qtip/runner/testplan.py index d20221df..d20221df 100644 --- a/qtip/runner/test_plan.py +++ b/qtip/runner/testplan.py diff --git a/qtip/utils/args_handler.py b/qtip/utils/args_handler.py index 513309ab..993b1035 100644 --- a/qtip/utils/args_handler.py +++ b/qtip/utils/args_handler.py @@ -21,13 +21,13 @@ def get_files_in_suite(suite_name, case_type='all'): def get_files_in_test_plan(lab, suite_name, case_type='all'): - test_case_all = os.listdir('benchmarks/test_plan/{0}/{1}'.format(lab, suite_name)) + test_case_all = os.listdir('benchmarks/testplan/{0}/{1}'.format(lab, suite_name)) return test_case_all if case_type == 'all' else \ filter(lambda x: case_type in x, test_case_all) def get_benchmark_path(lab, suit, benchmark): - return 'benchmarks/test_plan/{0}/{1}/{2}'.format(lab, suit, benchmark) + return 'benchmarks/testplan/{0}/{1}/{2}'.format(lab, suit, benchmark) def check_suite(suite_name): @@ -35,11 +35,11 @@ def check_suite(suite_name): def check_lab_name(lab_name): - return True if os.path.isdir('benchmarks/test_plan/' + lab_name) else False + return True if os.path.isdir('benchmarks/testplan/' + lab_name) else False def check_benchmark_name(lab, file, benchmark): - return os.path.isfile('benchmarks/test_plan/' + lab + '/' + file + '/' + benchmark) + return os.path.isfile('benchmarks/testplan/' + lab + '/' + file + '/' + benchmark) def _get_f_name(test_case_path): diff --git a/qtip/utils/cli.py b/qtip/utils/cli.py index c0a14214..5e566f27 100644 --- a/qtip/utils/cli.py +++ b/qtip/utils/cli.py @@ -23,7 +23,7 @@ class Cli: parser = argparse.ArgumentParser() parser.add_argument('-l ', '--lab', required=True, help='Name of Lab ' 'on which being tested, These can' - 'be found in the benchmarks/test_plan/ directory. Please ' + 'be found in the benchmarks/testplan/ directory. Please ' 'ensure that you have edited the respective files ' 'before using them. For testing other than through Jenkins' ' The user should list default after -l . all the fields in' @@ -49,7 +49,7 @@ class Cli: sys.exit(1) if not args_handler.check_lab_name(args.lab): - logger.error("You have specified a lab that is not present under benchmarks/test_plan/.\ + logger.error("You have specified a lab that is not present under benchmarks/testplan/.\ Please enter correct file. If unsure how to proceed, use -l default.") sys.exit(1) suite = args.file diff --git a/qtip/utils/report/Qtip_Report.py b/qtip/utils/report/qtip_report.py index cd20d57c..6809e892 100644 --- a/qtip/utils/report/Qtip_Report.py +++ b/qtip/utils/report/qtip_report.py @@ -23,6 +23,7 @@ def dump_result(Stor, directory, testcase): except OSError: print "Results for {0} not found".format(testcase) + doc = SimpleDocTemplate("../../results/QTIP_results.pdf", pagesize=letter, rightMargin=72, leftMargin=72, topMargin=72, bottomMargin=18) |