Merge "Clean redundant error logs of refstack_defcore in the console"

diff --combined functest/opnfv_tests/openstack/refstack_client/refstack_client.py
index 7d4c568,740515e..4312b7f
--- 1/functest/opnfv_tests/openstack/refstack_client/refstack_client.py
--- 2/functest/opnfv_tests/openstack/refstack_client/refstack_client.py
+++ b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py
@@@ -69,8 -69,8 +69,8 @@@ class RefstackClient(testcase_base.Test
                                self.defcorelist))
          logger.info("Starting Refstack_defcore test case: '%s'." % cmd)
  
-         header = ("Tempest environment:\n"
-                   "  Installer: %s\n  Scenario: %s\n  Node: %s\n  Date: %s\n" %
+         header = ("Refstack environment:\n"
+                   "  SUT: %s\n  Scenario: %s\n  Node: %s\n  Date: %s\n" %
                    (CONST.INSTALLER_TYPE,
                     CONST.DEPLOY_SCENARIO,
                     CONST.NODE_NAME,
@@@ -79,26 -79,23 +79,23 @@@
          f_stdout = open(
              os.path.join(conf_utils.REFSTACK_RESULTS_DIR,
                           "refstack.log"), 'w+')
-         f_stderr = open(
-             os.path.join(conf_utils.REFSTACK_RESULTS_DIR,
-                          "refstack-error.log"), 'w+')
          f_env = open(os.path.join(conf_utils.REFSTACK_RESULTS_DIR,
                                    "environment.log"), 'w+')
          f_env.write(header)
  
          p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE,
-                              stderr=f_stderr, bufsize=1)
+                              stderr=subprocess.STDOUT, bufsize=1)
  
          with p.stdout:
              for line in iter(p.stdout.readline, b''):
                  if 'Tests' in line:
                      break
-                 logger.info(line.replace('\n', ''))
+                 if re.search("\} tempest\.", line):
+                     logger.info(line.replace('\n', ''))
                  f_stdout.write(line)
          p.wait()
  
          f_stdout.close()
-         f_stderr.close()
          f_env.close()
  
      def parse_refstack_result(self):
@@@ -110,12 -107,16 +107,16 @@@
              for match in re.findall("Ran: (\d+) tests in (\d+\.\d{4}) sec.",
                                      output):
                  num_tests = match[0]
-             for match in re.findall("- Passed: (\d+)", output):
-                 num_success = match
-             for match in re.findall("- Skipped: (\d+)", output):
-                 num_skipped = match
-             for match in re.findall("- Failed: (\d+)", output):
-                 num_failures = match
+                 logger.info("Ran: %s tests in %s sec." % (num_tests, match[1]))
+             for match in re.findall("(- Passed: )(\d+)", output):
+                 num_success = match[1]
+                 logger.info("".join(match))
+             for match in re.findall("(- Skipped: )(\d+)", output):
+                 num_skipped = match[1]
+                 logger.info("".join(match))
+             for match in re.findall("(- Failed: )(\d+)", output):
+                 num_failures = match[1]
+                 logger.info("".join(match))
              success_testcases = ""
              for match in re.findall(r"\{0\}(.*?)[. ]*ok", output):
                  success_testcases += match + ", "
@@@ -129,10 -130,10 +130,10 @@@
              num_executed = int(num_tests) - int(num_skipped)
              success_rate = 100 * int(num_success) / int(num_executed)
  
 -            self.details = {"num_tests": int(num_tests),
 -                            "num_failures": int(num_failures),
 +            self.details = {"tests": int(num_tests),
 +                            "failures": int(num_failures),
                              "success": success_testcases,
 -                            "failed": failed_testcases,
 +                            "errors": failed_testcases,
                              "skipped": skipped_testcases}
          except Exception:
              success_rate = 0