diff options
| author |   xudan <xudan16@huawei.com> | 2017-05-23 08:28:58 -0400 |
|---|---|---|
| committer | xudan <xudan16@huawei.com> | 2017-05-24 00:05:26 -0400 |
| commit | ed7de0f59902094646ec53e0c3af192538833611 (patch) | |
| tree | 31dcfaa749cc7de9ca1ad6fc1d0e7fb490c6bafe /dovetail/testcase.py | |
| parent | bd5ff3bd10fffd84e79dad47be4d6fb7eea66d26 (diff) | |
SDNVPN test cases failed in CI
JIRA: DOVETAIL-439
1. SDNVPN test cases run in CI failed, because the file
/home/opnfv/repos/sdnvpn/sdnvpn/test/functest/config.yaml is empty.
2. copy the file userconfig/sdnvpn_config_testcase1/2/4/8.yaml
to /home/opnfv/repos/sdnvpn/sdnvpn/test/functest/config.yaml in Functest container
Change-Id: Ie904f83c755efc0d9e0abe5dcd44fe4a5056123e
Signed-off-by: xudan <xudan16@huawei.com>
Diffstat (limited to 'dovetail/testcase.py')
| -rw-r--r-- | dovetail/testcase.py | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/dovetail/testcase.py b/dovetail/testcase.py index 408599fc..2ceb8f20 100644 --- a/dovetail/testcase.py +++ b/dovetail/testcase.py @@ -115,24 +115,12 @@ class Testcase(object): self.name()) return pre_condition - def pre_copy_src_path(self, test_type): + def pre_copy_path(self, key_name): try: - pre_copy_src_file = \ - self.testcase['validate']['pre_copy']['src_file'] - result_dir = dt_cfg.dovetail_config[test_type]['result']['dir'] - except KeyError as e: - self.logger.error('src file Key error %s', e) - return None - src_path = os.path.join(result_dir, pre_copy_src_file) - return src_path - - def pre_copy_dest_path(self): - try: - pre_copy_dest_path = \ - self.testcase['validate']['pre_copy']['dest_path'] + path = self.testcase['validate']['pre_copy'][key_name] except KeyError: - pre_copy_dest_path = '' - return pre_copy_dest_path + return None + return path def post_condition(self): try: @@ -148,7 +136,7 @@ class Testcase(object): return post_condition def mk_src_file(self): - testcase_src_file = self.testcase['validate']['pre_copy']['src_file'] + testcase_src_file = self.pre_copy_path('src_file') try: file_path = os.path.join(dt_cfg.dovetail_config['result_dir'], testcase_src_file) @@ -158,12 +146,10 @@ class Testcase(object): self.logger.debug('save testcases %s', sub_test) src_file.write(sub_test + '\n') self.logger.debug('save testcases to %s', file_path) + return file_path except Exception: self.logger.error('Failed to save: %s', file_path) - - src_file_path = os.path.join(dt_cfg.dovetail_config['result_dir'], - testcase_src_file) - return src_file_path + return None def run(self): runner = TestRunnerFactory.create(self) |