Add new config param 'show_reproduce_content'

By default this param is True, if the test fails then the contents of
reproduce file are displayed. If the parameter is False, do not show
the contents of reproduce file.  For example, the 'sql-tap' tests run
each case in a separate tarantool instance, so reproduce is not
necessary for problem investigation. Used in 'suite.ini'.

Closes #113

Author: Sergei Voronezhskii

lib/test_suite.py

@@ -99,6 +99,8 @@ def __init__(self, suite_path, args):
             self.ini[i] = map(lambda x: os.path.join(suite_path, x),
                     dict.fromkeys(self.ini[i].split()) if i in self.ini else dict())
 
+        self.ini.update(dict(show_reproduce_content=self.show_reproduce_content))
+
     def find_tests(self):
         if self.ini['core'] == 'tarantool':
             TarantoolServer.find_tests(self, self.suite_path)
@@ -214,3 +216,11 @@ def is_parallel(self):
             raise ConfigurationError()
             pass
         return val
+
+    @property
+    def show_reproduce_content(self):
+        val = self.ini.get('show_reproduce_content', 'true')
+        if not isinstance(val, bool):
+            # It seems value from ini file, convert from string to bool
+            val = val.lower() != 'false'
+        return val

lib/worker.py

@@ -77,6 +77,7 @@ def get_task_groups():
                 'gen_worker': gen_worker,
                 'task_ids': task_ids,
                 'is_parallel': suite.is_parallel(),
+                'show_reproduce_content': suite.show_reproduce_content
             }
     return res
 
@@ -130,12 +131,13 @@ class WorkerTaskResult(BaseWorkerMessage):
     worker. The short_status (string) field intended to give short note whether
     the task processed successfully or not, but with little more flexibility
     than binary True/False. The task_id (any hashable object) field hold ID of
-    the processed task.
+    the processed task. The suite_ini dict with configuration.
     """
-    def __init__(self, worker_id, worker_name, task_id, short_status):
+    def __init__(self, worker_id, worker_name, task_id, short_status, suite_ini):
         super(WorkerTaskResult, self).__init__(worker_id, worker_name)
         self.short_status = short_status
         self.task_id = task_id
+        self.suite_ini = suite_ini
 
 
 class WorkerOutput(BaseWorkerMessage):
@@ -177,7 +179,7 @@ def done_marker(self):
         return WorkerDone(self.id, self.name)
 
     def wrap_result(self, task_id, short_status):
-        return WorkerTaskResult(self.id, self.name, task_id, short_status)
+        return WorkerTaskResult(self.id, self.name, task_id, short_status, self.suite.ini)
 
     def sigterm_handler(self, signum, frame):
         self.sigterm_received = True

listeners.py

@@ -37,7 +37,7 @@ def process_result(self, obj):
         self.stats[obj.short_status] += 1
 
         if obj.short_status == 'fail':
-            self.failed_tasks.append((obj.task_id, obj.worker_name))
+            self.failed_tasks.append((obj.task_id, obj.worker_name, obj.suite_ini))
 
     def print_statistics(self):
         """Returns are there failed tasks."""
@@ -50,15 +50,16 @@ def print_statistics(self):
             return False
 
         color_stdout('Failed tasks:\n', schema='test_var')
-        for task_id, worker_name in self.failed_tasks:
+        for task_id, worker_name, suite_ini in self.failed_tasks:
             logfile = self.get_logfile(worker_name)
-            reproduce_file_path = get_reproduce_file(worker_name)
             color_stdout('- %s' % yaml.safe_dump(task_id), schema='test_var')
             color_stdout('# logfile:        %s\n' % logfile)
+            reproduce_file_path = get_reproduce_file(worker_name)
             color_stdout('# reproduce file: %s\n' % reproduce_file_path)
-            color_stdout("---\n", schema='separator')
-            lib.utils.print_tail_n(reproduce_file_path)
-            color_stdout("...\n", schema='separator')
+            if suite_ini['show_reproduce_content']:
+                color_stdout("---\n", schema='separator')
+                lib.utils.print_tail_n(reproduce_file_path)
+                color_stdout("...\n", schema='separator')
 
         return True
 

test-run.py

@@ -151,6 +151,7 @@ def main_loop_consistent(failed_test_ids):
         color_stdout('-' * 75, "\n",       schema='separator')
 
         task_ids = task_group['task_ids']
+        show_reproduce_content = task_group['show_reproduce_content']
         if not task_ids:
             continue
         worker_id = 1
@@ -162,9 +163,10 @@ def main_loop_consistent(failed_test_ids):
                     lib.worker.get_reproduce_file(worker.name)
                 color_stdout('Reproduce file %s\n' %
                              reproduce_file_path, schema='error')
-                color_stdout("---\n", schema='separator')
-                lib.utils.print_tail_n(reproduce_file_path)
-                color_stdout("...\n", schema='separator')
+                if show_reproduce_content:
+                    color_stdout("---\n", schema='separator')
+                    lib.utils.print_tail_n(reproduce_file_path)
+                    color_stdout("...\n", schema='separator')
                 failed_test_ids.append(task_id)
                 if not lib.Options().args.is_force:
                     worker.stop_server(cleanup=False)