[Python-checkins] cpython (merge 3.2 -> default): one more test fix for systems without select.poll. tested by deleting

[gregory.p.smith]

http://hg.python.org/cpython/rev/94704db452e8
changeset:   78143:94704db452e8
parent:      78141:0112efcd42ce
parent:      78142:71537aba3a0a
user:        Gregory P. Smith <greg at krypto.org>
date:        Mon Jul 16 15:49:19 2012 -0700
summary:
  one more test fix for systems without select.poll.  tested by deleting
select.poll before running.  works both ways (finally).  this should
fix the windows build.

files:
  Lib/test/test_telnetlib.py |  9 ++++++---
  1 files changed, 6 insertions(+), 3 deletions(-)


diff --git a/Lib/test/test_telnetlib.py b/Lib/test/test_telnetlib.py
--- a/Lib/test/test_telnetlib.py
+++ b/Lib/test/test_telnetlib.py
@@ -170,13 +170,14 @@
     def setUp(self):
         self.old_select = select.select
         select.select = mock_select
+        self.old_poll = False
         if hasattr(select, 'poll'):
             self.old_poll = select.poll
             select.poll = MockPoller
             MockPoller.test_case = self
 
     def tearDown(self):
-        if hasattr(select, 'poll'):
+        if self.old_poll:
             MockPoller.test_case = None
             select.poll = self.old_poll
         select.select = self.old_select
@@ -211,7 +212,8 @@
         """Use select.select() to implement telnet.read_until()."""
         want = [b'x' * 10, b'match', b'y' * 10]
         telnet = test_telnet(want, use_poll=False)
-        select.poll = lambda *_: self.fail('unexpected poll() call.')
+        if self.old_poll:
+            select.poll = lambda *_: self.fail('unexpected poll() call.')
         data = telnet.read_until(b'match')
         self.assertEqual(data, b''.join(want[:-1]))
 
@@ -429,7 +431,8 @@
         """Use select.select() to implement telnet.expect()."""
         want = [b'x' * 10, b'match', b'y' * 10]
         telnet = test_telnet(want, use_poll=False)
-        select.poll = lambda *_: self.fail('unexpected poll() call.')
+        if self.old_poll:
+            select.poll = lambda *_: self.fail('unexpected poll() call.')
         (_,_,data) = telnet.expect([b'match'])
         self.assertEqual(data, b''.join(want[:-1]))
 

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