diff options
| author |   zhihui wu <wu.zhihui1@zte.com.cn> | 2016-11-08 10:06:33 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-11-08 10:06:33 +0000 |
| commit | aa374b2bac23a89442ef59f3757d40cdf66c3814 (patch) | |
| tree | db070ceb0a85ee0cd20f1ac4f43d6cff7567d870 /func | |
| parent | 3dff5b4dc848147235120f7befd5b5de29461846 (diff) | |
| parent | 6105c711e5d83d30b5733e7fec49d29a91520c26 (diff) | |
Merge "rename test_cases/ to test_plan/"
Diffstat (limited to 'func')
| -rw-r--r-- | func/args_handler.py | 10 | ||||
| -rw-r--r-- | func/cli.py | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/func/args_handler.py b/func/args_handler.py index 624f90c4..2eb79e29 100644 --- a/func/args_handler.py +++ b/func/args_handler.py @@ -20,14 +20,14 @@ def get_files_in_suite(suite_name, case_type='all'): if case_type == 'all' else benchmark_list[case_type] -def get_files_in_test_case(lab, suite_name, case_type='all'): - test_case_all = os.listdir('./test_cases/{0}/{1}'.format(lab, suite_name)) +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)) 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_cases/{0}/{1}/{2}'.format(lab, suit, benchmark) + return './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_cases/' + lab_name) else False + return True if os.path.isdir('test_plan/' + lab_name) else False def check_benchmark_name(lab, file, benchmark): - return os.path.isfile('test_cases/' + lab + '/' + file + '/' + benchmark) + return os.path.isfile('test_plan/' + lab + '/' + file + '/' + benchmark) def _get_f_name(test_case_path): diff --git a/func/cli.py b/func/cli.py index c5f5d2b7..17f0bde7 100644 --- a/func/cli.py +++ b/func/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_cases/ directory. Please ' + 'be found in the 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,12 +49,12 @@ 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_cases/.\ + logger.error("You have specified a lab that is not present under test_plan/.\ Please enter correct file. If unsure how to proceed, use -l default.") sys.exit(1) suite = args.file benchmarks = args_handler.get_files_in_suite(suite) - test_cases = args_handler.get_files_in_test_case(args.lab, suite) + test_cases = args_handler.get_files_in_test_plan(args.lab, suite) benchmarks_list = filter(lambda x: x in test_cases, benchmarks) if args.benchmark: |