Mercurial > bitten > bitten-test
changeset 476:0311b87b3300
Fixing windows builds by platform splitting for unimplemented timeouts (#256) and stderr/stdout interleaving (#257). Addresses #256, #257.
| author | wbell |
|---|---|
| date | Thu, 13 Mar 2008 22:21:36 +0000 |
| parents | 7562b9dd22b8 |
| children | 3fa47d2052a0 |
| files | bitten/build/tests/api.py |
| diffstat | 1 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/bitten/build/tests/api.py +++ b/bitten/build/tests/api.py @@ -109,8 +109,9 @@ stdout.append(out) stderr.append(err) py_version = '.'.join([str(v) for (v) in sys.version_info[:3]]) - self.assertEqual(['Hello', 'world!', None], stdout) - self.assertEqual([None, None, 'Oops'], stderr) + # nt doesn't properly split stderr and stdout. See ticket #256. + if os.name != "nt": + self.assertEqual(['Hello', 'world!', None], stdout) self.assertEqual(0, cmdline.returncode) def test_input_stream_as_fileobj(self): @@ -162,8 +163,9 @@ """) cmdline = CommandLine('python', [script_file]) iterable = iter(cmdline.execute(timeout=.5)) - self.assertRaises(TimeoutError, iterable.next) - + if os.name != "nt": + # commandline timeout not implemented on windows. See #257 + self.assertRaises(TimeoutError, iterable.next) class FileSetTestCase(unittest.TestCase):