Merge "abstract umbrella part to make integration code simpler"
authorSerena Feng <feng.xiaowei@zte.com.cn>
Fri, 9 Dec 2016 08:54:09 +0000 (08:54 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Fri, 9 Dec 2016 08:54:09 +0000 (08:54 +0000)
1  2 
functest/utils/functest_utils.py

@@@ -418,25 -418,8 +418,8 @@@ def merge_dicts(dict1, dict2)
              yield (k, dict2[k])
  
  
- def check_test_result(test_name, ret, start_time, stop_time):
-     def get_criteria_value():
-         return get_criteria_by_test(test_name).split('==')[1].strip()
-     status = 'FAIL'
-     if str(ret) == get_criteria_value():
-         status = 'PASS'
-     details = {
-         'timestart': start_time,
-         'duration': round(stop_time - start_time, 1),
-         'status': status,
-     }
-     return status, details
  def get_testcases_file_dir():
 -    return "/home/opnfv/repos/functest/functest/ci/testcases.yaml"
 +    return get_functest_config('general.functest.testcases_yaml')
  
  
  def get_functest_yaml():