From: Serena Feng <feng.xiaowei@zte.com.cn>
Date: Fri, 9 Dec 2016 08:54:09 +0000 (+0000)
Subject: Merge "abstract umbrella part to make integration code simpler"
X-Git-Tag: danube.1.RC1~264
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=dafed654965a05cab6891b53df80f11e37a1750a;p=functest.git

Merge "abstract umbrella part to make integration code simpler"
---

dafed654965a05cab6891b53df80f11e37a1750a
diff --cc functest/utils/functest_utils.py
index 5e2046873,3fafd4bf2..8f816cdf9
--- a/functest/utils/functest_utils.py
+++ b/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():