From 0dad384f018e92c87f7dd5a118ac9b09e239fc66 Mon Sep 17 00:00:00 2001
From: debugtalk <mail@debugtalk.com>
Date: Tue, 19 Sep 2017 23:27:38 +0800
Subject: [PATCH] move print_output function from runner.py to utils.py

---
 ate/runner.py | 22 ++++++----------------
 ate/utils.py  | 13 +++++++++++++
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/ate/runner.py b/ate/runner.py
index 18c29631..35c5b43b 100644
--- a/ate/runner.py
+++ b/ate/runner.py
@@ -172,12 +172,10 @@ class Runner(object):
                 success = False
 
         output_variables_list = config_dict.get("output", [])
-        output = self.generate_output(output_variables_list)
-        self.print_output(output)
 
         return {
             "success": success,
-            "output": output
+            "output": self.generate_output(output_variables_list)
         }
 
     def run_testsets(self, testsets):
@@ -200,21 +198,13 @@ class Runner(object):
         return success
 
     def generate_output(self, output_variables_list):
+        """ generate and print output
+        """
         variables_mapping = self.context.get_testcase_variables_mapping()
-        return {
+        output = {
             variable: variables_mapping[variable]
             for variable in output_variables_list
         }
+        utils.print_output(output)
 
-    def print_output(self, output):
-        if not output:
-            return
-
-        print("\n================== Output ==================")
-        print('{:<10}:  {:<}'.format("Variable", "Value"))
-        print('{:<10}:  {:<}'.format("--------", "-----"))
-
-        for variable, value in output.items():
-            print('{:<10}:  {:<}'.format(variable, value))
-
-        print("============================================\n")
+        return output
diff --git a/ate/utils.py b/ate/utils.py
index 1b8db202..b7c66508 100644
--- a/ate/utils.py
+++ b/ate/utils.py
@@ -359,3 +359,16 @@ def override_variables_binds(variable_binds, new_mapping):
         convert_to_order_dict(variable_binds),
         new_mapping
     )
+
+def print_output(output):
+    if not output:
+        return
+
+    print("\n================== Output ==================")
+    print('{:<10}:  {:<}'.format("Variable", "Value"))
+    print('{:<10}:  {:<}'.format("--------", "-----"))
+
+    for variable, value in output.items():
+        print('{:<10}:  {:<}'.format(variable, value))
+
+    print("============================================\n")