changeset:   100817:de8412dc477e
parent:      100815:96a98bcaac70
parent:      100816:b3c79e0ba477
user:        Martin Panter <vadmium+py@gmail.com>
date:        Thu Mar 31 21:06:06 2016 +0000
files:       Lib/test/test_io.py
description:
Issue #22854: Merge test fix from 3.5


diff -r 96a98bcaac70 -r de8412dc477e Lib/test/test_io.py
--- a/Lib/test/test_io.py	Thu Mar 31 15:31:20 2016 +0300
+++ b/Lib/test/test_io.py	Thu Mar 31 21:06:06 2016 +0000
@@ -449,7 +449,7 @@
                 else:
                     self.assertRaises(OSError, obj.write, data)
 
-                if sys.platform.startswith("win") or test in (
+                if sys.platform.startswith("win") and test in (
                         pipe_reader, pipe_writer):
                     # Pipes seem to appear as seekable on Windows
                     continue