]> granicus.if.org Git - python/commitdiff
bpo-30908: Fix dangling thread in test_os.TestSendfile (#2680) (#2845)
authorVictor Stinner <victor.stinner@gmail.com>
Mon, 24 Jul 2017 15:40:47 +0000 (17:40 +0200)
committerGitHub <noreply@github.com>
Mon, 24 Jul 2017 15:40:47 +0000 (17:40 +0200)
tearDown() now clears explicitly the self.server variable to make
sure that the thread is completely cleared when tearDownClass()
checks if all threads have been cleaned up.

Fix the following warning:

$ ./python -m test --fail-env-changed -m test.test_os.TestSendfile.test_keywords -R 3:1 test_os
(...)
Warning -- threading_cleanup() failed to cleanup 0 threads after 3 sec (count: 0, dangling: 2)
(...)
Tests result: ENV CHANGED
(cherry picked from commit d1cc037d1442cc35d1b194ec8e50901514360949)

Lib/test/test_os.py

index 8ad6d8e31179e175ffc6335c47e8d93537e19dd4..bb5d2e3429ce0f2f569db1c4cdd5bbf9af60bf52 100644 (file)
@@ -2443,6 +2443,7 @@ class TestSendfile(unittest.TestCase):
         self.client.close()
         if self.server.running:
             self.server.stop()
+        self.server = None
 
     def sendfile_wrapper(self, sock, file, offset, nbytes, headers=[], trailers=[]):
         """A higher level wrapper representing how an application is