Set RSS output from listener to main log

Merged and disabled changes in the previous 2 commmits and set RSS
output from listener to main log only.

Author: avtikhon

lib/pytap13.py

@@ -18,6 +18,8 @@
 
 import re
 
+from lib.colorer import color_log
+
 try:
     # Python 2
     from StringIO import StringIO
@@ -139,6 +141,7 @@ def _parse(self, source):
 
             if seek_test:
                 m = RE_TEST_LINE.match(line)
+                color_log('%s\n' % line, schema='test-run command')
                 if m and on_top_level:
                     self.__tests_counter += 1
                     t_attrs = m.groupdict()

lib/tarantool_server.py

@@ -43,7 +43,6 @@
 from lib.utils import signame
 from lib.utils import warn_unix_socket
 from lib.utils import prefix_each_line
-from lib.utils import get_mem_stat_rss
 from lib.test import TestRunGreenlet, TestExecutionError
 
 
@@ -199,9 +198,6 @@ def send_command_raw(self, command, ts):
         color_log("DEBUG: tarantool's response for [{}]\n{}\n".format(
             command.rstrip(), prefix_each_line(' | ', result)),
             schema='tarantool command')
-        if (Options().args.collect_statistics):
-            color_log('RSS: {}\n' . format(get_mem_stat_rss()),
-                      schema='tarantool command')
         return result
 
     def set_language(self, ts, language):

listeners.py

@@ -127,7 +127,6 @@ def save_artifacts(self):
 class LogOutputWatcher(BaseWatcher):
     def __init__(self):
         self.fds = dict()
-        self.fds_stat = dict()
         self.logdir = os.path.join(Options().args.vardir, 'log')
         try:
             os.makedirs(self.logdir)
@@ -139,26 +138,14 @@ def get_logfile(self, worker_name):
         filepath = os.path.join(self.logdir, filename)
         return os.path.realpath(filepath)
 
-    def get_statfile(self, worker_name):
-        filename = '%s.mem_stat.log' % worker_name
-        filepath = os.path.join(self.logdir, filename)
-        return os.path.realpath(filepath)
-
     def process_result(self, obj):
         if isinstance(obj, WorkerDone):
             self.fds[obj.worker_id].close()
             del self.fds[obj.worker_id]
-            self.fds_stat[obj.worker_id].close()
-            del self.fds_stat[obj.worker_id]
 
         if not isinstance(obj, WorkerOutput):
             return
 
-        if obj.worker_id not in self.fds_stat.keys():
-            filepath = self.get_statfile(obj.worker_name)
-            self.fds_stat[obj.worker_id] = open(filepath, 'w')
-        fd_stat = self.fds_stat[obj.worker_id]
-
         if obj.worker_id not in self.fds.keys():
             filepath = self.get_logfile(obj.worker_name)
             self.fds[obj.worker_id] = open(filepath, 'w')
@@ -182,10 +169,10 @@ def process_result(self, obj):
         output = prefix_each_line(prefix, output)
 
         fd.write(output)
-        fd.flush()
         if (Options().args.collect_statistics):
-            fd_stat.write(get_mem_stat_rss())
-            fd_stat.flush()
+            rss = '{}RSS: {}' . format(prefix, get_mem_stat_rss())
+            fd.write(rss)
+        fd.flush()
 
     def __del__(self):
         for fd in self.fds.values():