From ed267e3305a54eddae8106bdaae2c62d4c3b7db6 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Wed, 18 Oct 2017 11:28:35 +0300 Subject: [2.7] bpo-31786: Make functions in the select module blocking when timeout is a small negative value. (GH-4003). (#4031) (cherry picked from commit 2c15b29aea5d6b9c61aa42d2c24a07ff1edb4b46) --- Lib/test/test_poll.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/Lib/test/test_poll.py b/Lib/test/test_poll.py index 1e195ed..14dbfcf 100644 --- a/Lib/test/test_poll.py +++ b/Lib/test/test_poll.py @@ -205,6 +205,28 @@ class PollTests(unittest.TestCase): os.write(w, b'spam') t.join() + @unittest.skipUnless(threading, 'Threading required for this test.') + @reap_threads + def test_poll_blocks_with_negative_ms(self): + for timeout_ms in [None, -1, -1.0]: + # Create two file descriptors. This will be used to unlock + # the blocking call to poll.poll inside the thread + r, w = os.pipe() + pollster = select.poll() + pollster.register(r, select.POLLIN) + + poll_thread = threading.Thread(target=pollster.poll, args=(timeout_ms,)) + poll_thread.start() + poll_thread.join(timeout=0.1) + self.assertTrue(poll_thread.is_alive()) + + # Write to the pipe so pollster.poll unblocks and the thread ends. + os.write(w, b'spam') + poll_thread.join() + self.assertFalse(poll_thread.is_alive()) + os.close(r) + os.close(w) + def test_main(): run_unittest(PollTests) -- cgit v0.12