From: Victor Stinner <victor.stinner@gmail.com>
Date: Mon, 24 Jul 2017 15:40:50 +0000 (+0200)
Subject: bpo-30908: Fix dangling thread in test_os.TestSendfile (#2680) (#2844)
X-Git-Tag: v3.6.3rc1~209
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bb33ccfc5a216eff753b10a8dc59ec0277f1e1fb;p=python

bpo-30908: Fix dangling thread in test_os.TestSendfile (#2680) (#2844)

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)
---

diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index e4951b44ce..b65ccb7159 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -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