Add kill_server test

Author: igormp

tika/tests/test_tika.py

@@ -19,6 +19,7 @@
 import os
 import unittest
 import tika.parser
+import tika.tika
 
 
 class CreateTest(unittest.TestCase):
@@ -54,6 +55,12 @@ def test_local_path(self):
         file = os.path.join(os.path.dirname(__file__), 'files', 'rwservlet.pdf')
         self.assertTrue(tika.parser.from_file(file))
 
+    def test_kill_server(self):
+        """parse some file then kills server"""
+        file = os.path.join(os.path.dirname(__file__), 'files', 'rwservlet.pdf')
+        with open(file, 'rb') as file_obj:
+            tika.parser.from_file(file_obj)
+        self.assertIsNone(tika.tika.killServer())
 
 if __name__ == '__main__':
     unittest.main()

tika/tika.py

@@ -190,7 +190,7 @@ def make_content_disposition_header(fn):
 csvOutput = 0
 
 # will be used later on to kill the process and free up ram
-TikaServerProcess = ""
+TikaServerProcess = False
 
 class TikaException(Exception):
     pass
@@ -664,7 +664,6 @@ def startServer(tikaServerJar, java_path = TikaJava, java_args = TikaJavaArgs, s
         return False
 
     # Run java with jar args
-    # need to check if shell=true is really needed
     global TikaServerProcess
     TikaServerProcess = Popen(cmd_string, stdout=logFile, stderr=STDOUT, shell=True, preexec_fn=os.setsid)
 
@@ -688,10 +687,11 @@ def startServer(tikaServerJar, java_path = TikaJava, java_args = TikaJavaArgs, s
         return True
 
 def killServer():
-    if(TikaServerProcess.pid > 1):
+    if(TikaServerProcess):
         os.killpg(os.getpgid(TikaServerProcess.pid), signal.SIGTERM)
+        time.sleep(1)
     else:
-        log.error("Invalid server PID, won't kill")
+        log.error("Server not running, or was already running before")
 
 def toFilename(url):
     '''