0023629: [CEA] KERNEL_SALOME_CONCURRENT_TestConcurrentSession: does not return

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

diff --git a/bin/appliskel/salome_tester/salome_test_driver_gui.py b/bin/appliskel/salome_tester/salome_test_driver_gui.py
index c6d8566515fb9ccdcb544393165e255b0ad3dd6b..9d4940d955530a9c62007c707dfe2691f75ff57f 100644 (file)
--- a/bin/appliskel/salome_tester/salome_test_driver_gui.py
+++ b/bin/appliskel/salome_tester/salome_test_driver_gui.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
@@ -42,7 +42,7 @@ if __name__ == "__main__":
   # first argument
   if not args:
     print("Invalid arguments for salome_test_driver_gui.py. No command defined.")
-    exit(1)
+    sys.exit(1)
   _, ext = os.path.splitext(args[0])
   test_and_args = args
 
@@ -51,7 +51,7 @@ if __name__ == "__main__":
   setOmniOrbUserPath()
 
   # Set timeout handler
-  print("Test timeout explicitely set to: %s seconds"%timeout_delay)
+  print("Test timeout explicitly set to: %s seconds"%timeout_delay)
   timeout_sec = abs(int(timeout_delay)-10)
   if sys.platform == 'win32':
     from threading import Timer
@@ -71,10 +71,12 @@ if __name__ == "__main__":
     import traceback
     traceback.print_exc()
     pass
-
-  salome_instance.stop()
+  try:
+    salome_instance.stop()
+  except:
+    pass
   if sys.platform == 'win32':
     timer.cancel()
 #  print("Exit test with status code:", res)
-#  exit(res)
+#  sys.exit(res)
 #