Merge pull request #1435 from benallard/patch-1

Trial: Improve memory handling ...
buildbot · Dec 11, 2014 · cfab602 · cfab602
2 parents 6d084c7 + 56cc906
commit cfab602
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/master/buildbot/steps/python_twisted.py b/master/buildbot/steps/python_twisted.py
@@ -371,7 +371,7 @@ def __init__(self, reactor=UNSPECIFIED, python=None, trial=None,
         # handled in TrialTestCaseCounter.
         self.addLogObserver(
             'stdio', logobserver.LineConsumerLogObserver(self.logConsumer))
-        self.problems = ""
+        self.problems = []
         self.warnings = {}
 
         # text used before commandComplete runs
@@ -534,11 +534,11 @@ def logConsumer(self):
             if line.find("=" * 60) == 0 or line.find("-" * 60) == 0:
                 # read to EOF
                 while True:
-                    self.problems += line + "\n"
+                    self.problems.append(line)
                     stream, line = yield
 
     def createSummary(self, loog):
-        problems = self.problems
+        problems = '\n'.join(self.problems)
         warnings = self.warnings
 
         if problems:

diff --git a/master/buildbot/test/unit/test_steps_python_twisted.py b/master/buildbot/test/unit/test_steps_python_twisted.py
@@ -196,7 +196,7 @@ def test_run_failure(self):
             + 1
         )
         self.expectOutcome(result=FAILURE, state_string='tests 8 failures (failure)')
-        self.expectLogfile('problems', failureLog.split('\n\n', 1)[1])
+        self.expectLogfile('problems', failureLog.split('\n\n', 1)[1][:-1])
         self.expectLogfile('warnings', textwrap.dedent('''\
                 buildbot.test.unit.test_steps_python_twisted.Trial.test_run_env_nodupe ... [FAILURE]/home/dustin/code/buildbot/t/buildbot/master/buildbot/test/fake/logfile.py:92: UserWarning: step uses removed LogFile method `getText`
                 buildbot.test.unit.test_steps_python_twisted.Trial.test_run_env_supplement ... [FAILURE]/home/dustin/code/buildbot/t/buildbot/master/buildbot/test/fake/logfile.py:92: UserWarning: step uses removed LogFile method `getText`