Merge changes from topic 'revert_write_to_file'

* changes:
  Add can_dump_request_to_file decorator
  Revert "write test results to a local file"

1 files changed, 11 insertions, 36 deletions

diff --git a/functest/core/testcase_base.py b/functest/core/testcase_base.py
index ec46bc643..838b63983 100644
--- a/functest/core/testcase_base.py
+++ b/functest/core/testcase_base.py
@@ -9,7 +9,6 @@
 
 import os
 
-from functest.utils.constants import CONST
 import functest.utils.functest_logger as ft_logger
 import functest.utils.functest_utils as ft_utils
 
@@ -18,7 +17,7 @@ class TestcaseBase(object):
 
     EX_OK = os.EX_OK
     EX_RUN_ERROR = os.EX_SOFTWARE
-    EX_PUBLISH_RESULT_FAILED = os.EX_SOFTWARE - 1
+    EX_PUSH_TO_DB_ERROR = os.EX_SOFTWARE - 1
     EX_TESTCASE_FAILED = os.EX_SOFTWARE - 2
 
     logger = ft_logger.Logger(__name__).getLogger()
@@ -44,45 +43,21 @@ class TestcaseBase(object):
         self.logger.error("Run must be implemented")
         return TestcaseBase.EX_RUN_ERROR
 
-    def publish_report(self):
-        if "RESULTS_STORE" in os.environ:
-            CONST.results_test_db_url = os.environ['RESULTS_STORE']
-
+    def push_to_db(self):
         try:
             assert self.project_name
             assert self.case_name
             assert self.criteria
             assert self.start_time
             assert self.stop_time
-            if CONST.results_test_db_url.lower().startswith(
-                    ("http://", "https://")):
-                self.push_to_db()
-            elif CONST.results_test_db_url.lower().startswith("file://"):
-                self.write_to_file()
+            if ft_utils.push_results_to_db(
+                    self.project_name, self.case_name, self.start_time,
+                    self.stop_time, self.criteria, self.details):
+                self.logger.info("The results were successfully pushed to DB")
+                return TestcaseBase.EX_OK
             else:
-                self.logger.error("Please check parameter test_db_url and "
-                                  "OS environ variable RESTULTS_STORE")
-                return TestcaseBase.EX_PUBLISH_RESULT_FAILED
+                self.logger.error("The results cannot be pushed to DB")
+                return TestcaseBase.EX_PUSH_TO_DB_ERROR
         except Exception:
-            self.logger.exception("The results cannot be stored")
-            return TestcaseBase.EX_PUBLISH_RESULT_FAILED
-
-    def write_to_file(self):
-        if ft_utils.write_results_to_file(
-                self.project_name, self.case_name, self.start_time,
-                self.stop_time, self.criteria, self.details):
-            self.logger.info("The results were successfully written to a file")
-            return TestcaseBase.EX_OK
-        else:
-            self.logger.error("write results to a file failed")
-            return TestcaseBase.EX_PUBLISH_RESULT_FAILED
-
-    def push_to_db(self):
-        if ft_utils.push_results_to_db(
-                self.project_name, self.case_name, self.start_time,
-                self.stop_time, self.criteria, self.details):
-            self.logger.info("The results were successfully pushed to DB")
-            return TestcaseBase.EX_OK
-        else:
-            self.logger.error("The results cannot be pushed to DB")
-            return TestcaseBase.EX_PUBLISH_RESULT_FAILED
+            self.logger.exception("The results cannot be pushed to DB")
+            return TestcaseBase.EX_PUSH_TO_DB_ERROR