Merge master branch into V9_dev

[modules/kernel.git] / bin / appliskel / salome_tester / salome_test_driver.py

diff --git a/bin/appliskel/salome_tester/salome_test_driver.py b/bin/appliskel/salome_tester/salome_test_driver.py
index e4dbcd157c70f281e3ebf7ecebd8c7489411584e..62dcc5fe2c6f933aae92ca7ceb4d497c51c93d47 100644 (file)
--- a/bin/appliskel/salome_tester/salome_test_driver.py
+++ b/bin/appliskel/salome_tester/salome_test_driver.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2015-2017  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -68,7 +68,7 @@ if __name__ == "__main__":
   # first argument
   if not args:
     print("Invalid arguments for salome_test_driver.py. No command defined.")
-    exit(1)
+    sys.exit(1)
   _, ext = os.path.splitext(args[0])
   if ext == ".py":
     test_and_args = [sys.executable] + args
@@ -104,10 +104,13 @@ if __name__ == "__main__":
     import traceback
     traceback.print_exc()
     pass
-
-  salome_instance.stop()
+  try:
+    salome_instance.stop()
+    os.kill(pid, signal.SIGTERM)
+  except:
+    pass
   if sys.platform == 'win32':
     timer.cancel()
   print("Exit test with status code:", res)
-  exit(res)
+  sys.exit(res)
 #