]> granicus.if.org Git - python/commitdiff
bpo-30908: Fix dangling thread in test_os.TestSendfile (#2680) (#2844)
authorVictor Stinner <victor.stinner@gmail.com>
Mon, 24 Jul 2017 15:40:50 +0000 (17:40 +0200)
committerGitHub <noreply@github.com>
Mon, 24 Jul 2017 15:40:50 +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 e4951b44ce495541a4ee852ce74a2dd0396ffd65..b65ccb71591da5a1874f493456581ce254766777 100644 (file)
@@ -2621,6 +2621,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