Merge branch 'windows_test_fixes' of git://github.com/rholden/buildbot

* 'windows_test_fixes' of git://github.com/rholden/buildbot:
  Remove redundant test.

Conflicts:
	slave/buildslave/test/unit/test_slave_commands_base.py

slave/buildslave/test/unit/test_slave_commands_base.py

@@ -8,6 +8,8 @@
 from buildslave.commands.base import ShellCommand, Obfuscated, \
     DummyCommand, WaitCommand, waitCommandRegistry, AbandonChain
 from buildslave.commands.utils import getCommand
+from twisted.python import runtime
+
 
 class FakeSlaveBuilder:
     debug = False
@@ -112,19 +114,6 @@ def check(ign):
         d.addCallback(check)
         return d
 
-    def testKeepStdout(self):
-        basedir = "test_slave_commands_base.shellcommand.keepstdout"
-        b = FakeSlaveBuilder(False, basedir)
-        s = ShellCommand(b, stdoutCommand('hello'), basedir, keepStdout=True)
-
-        d = s.start()
-        def check(ign):
-            self.failUnless({'stdout': nl('hello\n')} in b.updates, ppupdates(b.updates))
-            self.failUnless({'rc': 0} in b.updates, ppupdates(b.updates))
-            self.failUnlessEquals(s.stdout, nl('hello\n'))
-        d.addCallback(check)
-        return d
-
     def testStringCommand(self):
         basedir = "test_slave_commands_base.shellcommand.string"
         b = FakeSlaveBuilder(False, basedir)