Clean up server termination

Author: myint

language_check/__init__.py

@@ -352,9 +352,7 @@ def _start_server(cls):
                             cls._port, port))
                     break
             if not match:
-                cls._terminate_server()
-                err_msg = cls._server.communicate()[1].strip()
-                cls._server = None
+                err_msg = cls._terminate_server()
                 match = cls._PORT_RE.search(err_msg)
                 if not match:
                     raise Error(err_msg)
@@ -397,11 +395,21 @@ def _server_is_alive(cls):
 
     @classmethod
     def _terminate_server(cls):
+        error_message = ''
+
         try:
             cls._server.terminate()
+            error_message = cls._server.communicate()[1].strip()
+
+            cls._server.stdin.close()
+            cls._server.stdout.close()
+            cls._server.stderr.close()
+            cls._server = None
         except OSError:
             pass
 
+        return error_message
+
 
 def _consume(stdout):
     """Consume/ignore the rest of the server output.

test.py

@@ -103,12 +103,18 @@ def test_correct(self):
                 self.assertEqual(self.lang_check.correct(text), result)
 
     def test_languages(self):
-        languages = language_check.get_languages()
-        self.assertIn('en', languages)
+        self.assertIn('en', language_check.get_languages())
 
     def test_version(self):
-        version = language_check.get_version()
-        self.assertTrue(version)
+        self.assertTrue(language_check.get_version())
+
+    def test_get_build_date(self):
+        self.assertTrue(language_check.get_build_date())
+
+    def test_get_directory(self):
+        path = language_check.get_directory()
+        language_check.set_directory(path)
+        self.assertEqual(path, language_check.get_directory())
 
 
 if __name__ == '__main__':