From: Martin v. Löwis <martin@v.loewis.de>
Date: Sat, 24 May 2008 09:36:45 +0000 (+0000)
Subject: Don't try to get the window size if it was never set before.
X-Git-Tag: v2.6b1~276
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7d3d04d6dbe90aaec04e23ba417f2e0d4f954bab;p=python

Don't try to get the window size if it was never set before.
Fixes the test failure on Solaris.
---

diff --git a/Lib/test/test_ioctl.py b/Lib/test/test_ioctl.py
index 9e6d4bcfbd..d46b10d5d9 100644
--- a/Lib/test/test_ioctl.py
+++ b/Lib/test/test_ioctl.py
@@ -52,13 +52,10 @@ class IoctlTests(unittest.TestCase):
                 set_winsz_opcode_maybe_neg, = struct.unpack("i",
                         struct.pack("I", termios.TIOCSWINSZ))
 
-            # We're just testing that these calls do not raise exceptions.
-            saved_winsz = fcntl.ioctl(mfd, termios.TIOCGWINSZ, "\0"*8)
             our_winsz = struct.pack("HHHH",80,25,0,0)
             # test both with a positive and potentially negative ioctl code
             new_winsz = fcntl.ioctl(mfd, set_winsz_opcode_pos, our_winsz)
             new_winsz = fcntl.ioctl(mfd, set_winsz_opcode_maybe_neg, our_winsz)
-            fcntl.ioctl(mfd, set_winsz_opcode_maybe_neg, saved_winsz)
         finally:
             os.close(mfd)
             os.close(sfd)