changeset:   100812:3b7811b58a1f
parent:      100810:fb10d1f5016e
parent:      100811:66765a49465f
user:        Martin Panter <vadmium+py@gmail.com>
date:        Thu Mar 31 11:17:08 2016 +0000
files:       Lib/test/test_io.py
description:
Issue #22854: Merge Windows pipe skipping from 3.5


diff -r fb10d1f5016e -r 3b7811b58a1f Lib/test/test_io.py
--- a/Lib/test/test_io.py	Thu Mar 31 10:31:30 2016 +0000
+++ b/Lib/test/test_io.py	Thu Mar 31 11:17:08 2016 +0000
@@ -424,13 +424,6 @@
                 self.assertEqual(obj.readable(), readable)
                 writable = "w" in abilities
                 self.assertEqual(obj.writable(), writable)
-                seekable = "s" in abilities
-
-                # Detection of pipes being non-seekable does not seem to work
-                # on Windows
-                if not sys.platform.startswith("win") or test not in (
-                        pipe_reader, pipe_writer):
-                    self.assertEqual(obj.seekable(), seekable)
 
                 if isinstance(obj, self.TextIOBase):
                     data = "3"
@@ -456,6 +449,13 @@
                 else:
                     self.assertRaises(OSError, obj.write, data)
 
+                if sys.platform.startswith("win") or test in (
+                        pipe_reader, pipe_writer):
+                    # Pipes seem to appear as seekable on Windows
+                    continue
+                seekable = "s" in abilities
+                self.assertEqual(obj.seekable(), seekable)
+
                 if seekable:
                     obj.tell()
                     obj.seek(0)