From 954d46b2ccf2c5800b89bd6c8616cafeb39168d6 Mon Sep 17 00:00:00 2001 From: "Gregory P. Smith" Date: Mon, 16 Jul 2012 15:48:30 -0700 Subject: [PATCH] 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. --- Lib/test/test_telnetlib.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_telnetlib.py b/Lib/test/test_telnetlib.py index f8f854c110..95eebf3cbc 100644 --- a/Lib/test/test_telnetlib.py +++ b/Lib/test/test_telnetlib.py @@ -169,13 +169,14 @@ class ExpectAndReadTestCase(TestCase): 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 @@ -210,7 +211,8 @@ class ReadTests(ExpectAndReadTestCase): """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])) @@ -428,7 +430,8 @@ class ExpectTests(ExpectAndReadTestCase): """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])) -- 2.40.0