diff options
| -rw-r--r-- | qtip/utils/args_handler.py | 8 | ||||
| -rw-r--r-- | qtip/utils/cli.py | 4 | ||||
| -rw-r--r-- | tests/args_handler_test.py | 2 | ||||
| -rw-r--r-- | tests/cli_test.py | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/qtip/utils/args_handler.py b/qtip/utils/args_handler.py index 879fd204..513309ab 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('./test_plan/{0}/{1}'.format(lab, suite_name)) + test_case_all = os.listdir('benchmarks/test_plan/{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 './test_plan/{0}/{1}/{2}'.format(lab, suit, benchmark) + return 'benchmarks/test_plan/{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('test_plan/' + lab_name) else False + return True if os.path.isdir('benchmarks/test_plan/' + lab_name) else False def check_benchmark_name(lab, file, benchmark): - return os.path.isfile('test_plan/' + lab + '/' + file + '/' + benchmark) + return os.path.isfile('benchmarks/test_plan/' + lab + '/' + file + '/' + benchmark) def _get_f_name(test_case_path): diff --git a/qtip/utils/cli.py b/qtip/utils/cli.py index def70061..c0a14214 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 test_plan/ directory. Please ' + 'be found in the benchmarks/test_plan/ 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 test_plan/.\ + logger.error("You have specified a lab that is not present under benchmarks/test_plan/.\ Please enter correct file. If unsure how to proceed, use -l default.") sys.exit(1) suite = args.file diff --git a/tests/args_handler_test.py b/tests/args_handler_test.py index 625a42f5..76c0646e 100644 --- a/tests/args_handler_test.py +++ b/tests/args_handler_test.py @@ -13,7 +13,7 @@ import utils.args_handler class TestClass: @pytest.mark.parametrize("test_input, expected", [ - (['fuel', '/home', './test_plan/default/network/iperf_bm.yaml'], + (['fuel', '/home', 'benchmarks/test_plan/default/network/iperf_bm.yaml'], ['fuel', '/home', "iperf", [('1-server', ['10.20.0.23']), ('2-host', ['10.20.0.24'])], "iperf_bm.yaml", diff --git a/tests/cli_test.py b/tests/cli_test.py index 255c2a37..cc8c7630 100644 --- a/tests/cli_test.py +++ b/tests/cli_test.py @@ -30,8 +30,8 @@ class TestClass: (['-l', 'default', '-f', - 'storage'], [('fuel', '/home', './test_plan/default/storage/fio_bm.yaml'), - ('fuel', '/home', './test_plan/default/storage/fio_vm.yaml')]) + 'storage'], [('fuel', '/home', 'benchmarks/test_plan/default/storage/fio_bm.yaml'), + ('fuel', '/home', 'benchmarks/test_plan/default/storage/fio_vm.yaml')]) ]) @mock.patch('func.cli.args_handler.prepare_and_run_benchmark') def test_cli_successful(self, mock_args_handler, test_input, expected): |