[Python-checkins] cpython: More lenient skipping of console tests.

[steve.dower]

https://hg.python.org/cpython/rev/3c7fb7aa6d2c
changeset:   103361:3c7fb7aa6d2c
user:        Steve Dower <steve.dower at microsoft.com>
date:        Thu Sep 08 14:36:18 2016 -0700
summary:
  More lenient skipping of console tests.

files:
  Lib/test/test_winconsoleio.py |  18 +++++++++++++++---
  1 files changed, 15 insertions(+), 3 deletions(-)


diff --git a/Lib/test/test_winconsoleio.py b/Lib/test/test_winconsoleio.py
--- a/Lib/test/test_winconsoleio.py
+++ b/Lib/test/test_winconsoleio.py
@@ -25,24 +25,36 @@
         self.assertFalse(issubclass(ConIO, io.TextIOBase))
 
     def test_open_fd(self):
-        if sys.stdin.fileno() == 0:
+        try:
             f = ConIO(0)
+        except ValueError:
+            # cannot open console because it's not a real console
+            pass
+        else:
             self.assertTrue(f.readable())
             self.assertFalse(f.writable())
             self.assertEqual(0, f.fileno())
             f.close()   # multiple close should not crash
             f.close()
 
-        if sys.stdout.fileno() == 1:
+        try:
             f = ConIO(1, 'w')
+        except ValueError:
+            # cannot open console because it's not a real console
+            pass
+        else:
             self.assertFalse(f.readable())
             self.assertTrue(f.writable())
             self.assertEqual(1, f.fileno())
             f.close()
             f.close()
 
-        if sys.stderr.fileno() == 2:
+        try:
             f = ConIO(2, 'w')
+        except ValueError:
+            # cannot open console because it's not a real console
+            pass
+        else:
             self.assertFalse(f.readable())
             self.assertTrue(f.writable())
             self.assertEqual(2, f.fileno())

-- 
Repository URL: https://hg.python.org/cpython