Merge branch 'test_newlines' of git://github.com/krajaratnam/buildbot

* 'test_newlines' of git://github.com/krajaratnam/buildbot: Test: fix a couple of newlines issues on Windows
djmitche · Feb 1, 2010 · 6bcc400 · 6bcc400
2 parents 5cb1859 + b4df6bb
commit 6bcc400
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/buildbot/test/runs/test_steps.py b/buildbot/test/runs/test_steps.py
@@ -727,7 +727,7 @@ def _checkResult(result):
             for log in step.step_status.getLogs():
                 logs[log.getName()] = log
             self.failUnless("warnings" in logs)
-            lines = logs["warnings"].readlines()
+            lines = [ line.replace("\r\n", "\n") for line in logs["warnings"].readlines() ]
             self.failUnlessEqual(len(lines), 2)
             self.failUnlessEqual(lines[0], "baz.c:34: warning: `magic' defined but not used\n")
             self.failUnlessEqual(lines[1], "foo.c:100: warning: `xyzzy' defined but not used\n")

diff --git a/buildbot/test/unit/test_shell.py b/buildbot/test/unit/test_shell.py
@@ -20,8 +20,8 @@ def testOne(self):
         d = self.startCommand(SlaveShellCommand, args)
         d.addCallback(self.collectUpdates)
         def _check(logs):
-            self.failUnlessEqual(logs['stdout'], "this is stdout\n")
-            self.failUnlessEqual(logs['stderr'], "this is stderr\n")
+            self.failUnlessEqual(logs['stdout'].replace("\r\n", "\n"), "this is stdout\n")
+            self.failUnlessEqual(logs['stderr'].replace("\r\n", "\n"), "this is stderr\n")
         d.addCallback(_check)
         return d