diff options
| -rwxr-xr-x | dovetail/run.py | 6 | ||||
| -rw-r--r-- | dovetail/test_runner.py | 19 | ||||
| -rw-r--r-- | dovetail/testcase.py | 50 |
3 files changed, 12 insertions, 63 deletions
diff --git a/dovetail/run.py b/dovetail/run.py index 8d4b7f8d..3037980b 100755 --- a/dovetail/run.py +++ b/dovetail/run.py @@ -52,12 +52,6 @@ def run_test(testcase_list, logger): testcase = Testcase.get(testcase_name) run_testcase = True - # if testcase.exceed_max_retry_times(): - # run_testcase = False - - # if testcase.script_result_acquired(): - # run_testcase = False - if run_testcase: testcase.run() diff --git a/dovetail/test_runner.py b/dovetail/test_runner.py index a2bc774c..95bed6f9 100644 --- a/dovetail/test_runner.py +++ b/dovetail/test_runner.py @@ -106,7 +106,6 @@ class DockerRunner(object): if cmds: for cmd in cmds: ret, msg = container.exec_cmd(cmd) - self.testcase.cleaned(True) if not dt_cfg.dovetail_config['noclean']: container.clean() @@ -229,18 +228,14 @@ class ShellRunner(object): def run(self): testcase_passed = 'PASS' - prepare_failed = False result = {'pass': 'PASS', 'results': []} - if not self.testcase.prepared(): - cmds = self.testcase.pre_condition() - for cmd in cmds: - ret, msg = dt_utils.exec_cmd(cmd, self.logger) - result['results'].append((cmd, ret, msg)) - if ret != 0: - prepare_failed = True - break - if not prepare_failed: - self.testcase.prepared(True) + cmds = self.testcase.pre_condition() + for cmd in cmds: + ret, msg = dt_utils.exec_cmd(cmd, self.logger) + result['results'].append((cmd, ret, msg)) + if ret != 0: + self.logger.error('Failed to execute all pre_condition cmds.') + break if not self.testcase.prepare_cmd(self.type): self.logger.error( diff --git a/dovetail/testcase.py b/dovetail/testcase.py index ba289053..33f14a97 100644 --- a/dovetail/testcase.py +++ b/dovetail/testcase.py @@ -89,13 +89,7 @@ class Testcase(object): def validate_testcase(self): return self.testcase['validate']['testcase'] - def exceed_max_retry_times(self): - # logger.debug('retry times:%d' % self.testcase['retry']) - return self._exceed_max_retry_times(self.validate_testcase()) - def increase_retry(self): - # self.testcase['retry'] = self.testcase['retry'] + 1 - # return self.testcase['retry'] return self._increase_retry(self.validate_testcase()) def passed(self, passed=None): @@ -109,9 +103,6 @@ class Testcase(object): def get_results(self): return self.results - def script_result_acquired(self, acquired=None): - return self._result_acquired(self.validate_testcase(), acquired) - def pre_condition(self): try: pre_condition = self.testcase['validate']['pre_condition'] @@ -177,18 +168,6 @@ class Testcase(object): # testcase in dovetail testcase_list = {} - @classmethod - def prepared(cls, prepared=None): - if prepared is not None: - cls.validate_testcase_list['prepared'] = prepared - return cls.validate_testcase_list['prepared'] - - @classmethod - def cleaned(cls, cleaned=None): - if cleaned is not None: - cls.validate_testcase_list['cleaned'] = cleaned - return cls.validate_testcase_list['cleaned'] - @staticmethod def pre_condition_cls(validate_type): try: @@ -203,32 +182,15 @@ class Testcase(object): except KeyError: return None - @classmethod - def update_validate_testcase(cls, testcase_name): - if testcase_name not in cls.validate_testcase_list: - cls.validate_testcase_list[testcase_name] = \ - {'retry': 0, 'acquired': False} - cls.validate_testcase_list['prepared'] = False - cls.validate_testcase_list['cleaned'] = False + def update_validate_testcase(self, testcase_name): + if testcase_name not in self.validate_testcase_list: + self.validate_testcase_list[testcase_name] = {'retry': 0} - @classmethod - def _exceed_max_retry_times(cls, validate_testcase): - retry = cls.validate_testcase_list[validate_testcase]['retry'] - return retry > 1 - - @classmethod def _increase_retry(cls, validate_testcase): cls.validate_testcase_list[validate_testcase]['retry'] += 1 return cls.validate_testcase_list[validate_testcase]['retry'] @classmethod - def _result_acquired(cls, testcase, acquired=None): - if acquired is not None: - cls.validate_testcase_list[testcase]['acquired'] = \ - acquired - return cls.validate_testcase_list[testcase]['acquired'] - - @classmethod def load(cls): abs_testcase_path = constants.TESTCASE_PATH for root, dirs, files in os.walk(abs_testcase_path): @@ -250,8 +212,8 @@ class Testcase(object): return cls.testcase_list[testcase_name] return None - @classmethod - def check_testarea(cls, testarea): + @staticmethod + def check_testarea(testarea): area_no_duplicate = [] area_full = ['full'] @@ -428,8 +390,6 @@ class Testsuite(object): testsuite_yaml = yaml.safe_load(f) cls.testsuite_list.update(testsuite_yaml) - # cls.logger.debug(cls.testsuite_list) - @classmethod def get(cls, testsuite_name): if testsuite_name in cls.testsuite_list: |