From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Thu, 25 Jul 2013 03:21:00 +0000 (+0200)
Subject: #14853: remove test that was making too many assumptions about stdin.  Patch by Elena... 
X-Git-Tag: v2.7.6rc1~282
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e21b6ae725bdc8f183745ae7b6289966f4d5337a;p=thirdparty%2FPython%2Fcpython.git

#14853: remove test that was making too many assumptions about stdin.  Patch by Elena Oat.
---

diff --git a/Lib/test/test_file.py b/Lib/test/test_file.py
index dffa4b56eb63..ac2aafa1ce49 100644
--- a/Lib/test/test_file.py
+++ b/Lib/test/test_file.py
@@ -154,16 +154,6 @@ class OtherFileTests(unittest.TestCase):
                 f.close()
                 self.fail('%r is an invalid file mode' % mode)
 
-    def testStdin(self):
-        # This causes the interpreter to exit on OSF1 v5.1.
-        if sys.platform != 'osf1V5':
-            self.assertRaises((IOError, ValueError), sys.stdin.seek, -1)
-        else:
-            print((
-                '  Skipping sys.stdin.seek(-1), it may crash the interpreter.'
-                ' Test manually.'), file=sys.__stdout__)
-        self.assertRaises((IOError, ValueError), sys.stdin.truncate)
-
     def testBadModeArgument(self):
         # verify that we get a sensible error message for bad mode argument
         bad_mode = "qwerty"
diff --git a/Misc/ACKS b/Misc/ACKS
index b265036444a3..cf553b70e6f5 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -744,6 +744,7 @@ Nigel O'Brian
 Kevin O'Connor
 Tim O'Malley
 Zooko O'Whielacronx
+Elena Oat
 Pascal Oberndoerfer
 Jeffrey Ollie
 Adam Olsen