Close communication channel before exiting the test runner (DonJayamanne#1597)

DonJayamanne · web-flow · commit b40cc2c8b67d · 2018-05-07T11:52:36.000-07:00
* Close communication channel before exiting the test runner * revert change * Fixes DonJayamanne#1529
diff --git a/news/2 Fixes/1529.md b/news/2 Fixes/1529.md
@@ -0,0 +1 @@
+Close communication channel before exiting the test runner.
diff --git a/pythonFiles/PythonTools/visualstudio_py_testlauncher.py b/pythonFiles/PythonTools/visualstudio_py_testlauncher.py
@@ -102,12 +102,20 @@ def __init__(self, socket, callback):
         self.seq = 0
         self.callback = callback
         self.lock = thread.allocate_lock()
+        self._closed = False
         # start the testing reader thread loop
         self.test_thread_id = thread.start_new_thread(self.readSocket, ())
 
+    def close(self):
+        self._closed = True
+
     def readSocket(self):
-        data = self.socket.recv(1024)
-        self.callback()
+        try:
+            data = self.socket.recv(1024)
+            self.callback()
+        except OSError:
+            if not self._closed:
+                raise
 
     def receive(self):
         pass
@@ -312,6 +320,8 @@ def main():
         else:
             runner = unittest.TextTestRunner(verbosity=opts.uvInt, resultclass=VsTestResult)
         result = runner.run(tests)
+        if _channel is not None:
+            _channel.close()
         sys.exit(not result.wasSuccessful())
     finally:
         if cov is not None:

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Close communication channel before exiting the test runner.`