fix a few test failures on windoze

djmitche · Feb 1, 2010 · f24dc81 · f24dc81
1 parent cb9c970
commit f24dc81
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/buildbot/test/test_properties.py b/buildbot/test/test_properties.py
@@ -248,8 +248,8 @@ def testSetPropertySimple(self):
         def _check_props(bs):
             self.failUnlessEqual(bs.getProperty("foo"), "foo")
             self.failUnlessEqual(bs.getProperty("wp"), "wp")
-            # (will this fail on some platforms, due to newline differences?)
-            self.failUnlessEqual(bs.getProperty("bar"), "bar\n")
+            # (replace converts windows newlines to native)
+            self.failUnlessEqual(bs.getProperty("bar").replace("\r\n", "\n"), "bar\n")
             return bs
         d.addCallback(_check_props)
         return d
@@ -263,6 +263,8 @@ def _check_props(bs):
     """)
 
     def testSetPropertyExtractFn(self):
+        if sys.platform == 'win32':
+            raise unittest.SkipTest("stderr doesn't work on windoze")
         d = self.master.loadConfig(self.SetPropertyExtractFn_config)
         d.addCallback(lambda res: self.master.startService())
         d.addCallback(lambda res: self.connectOneSlave("bot1"))