add pid to port log filename

[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 2587881ce5174c54a5b72023efba6532c328c1b8..7b119d1765804d61475874548adc55737d26d484 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  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
@@ -18,7 +18,7 @@
 #
 
 """
-Usage: salome_test_helper.py <timeout_delay> <test_file.py> [test file arguments]
+Usage: salome_test_driver.py <timeout_delay> <test command> [test command arguments]
 """
 
 import sys
@@ -29,26 +29,18 @@ import signal
 # Run test
 def runTest(command):
   print "Running:", " ".join(command)
-  p = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-  out, err = p.communicate()
+  p = subprocess.Popen(command)
+  p.communicate()
   res = p.returncode
-
-  return res, out, err
-#
-
-# Display output and errors
-def processResult(res, out, err):
-  if out:
-    print out
-    pass
-  if err:
-    print err
-  print "Status code: ", res
+  # About res value:
+  # A negative value -N indicates that the child was terminated by signal N (Unix only).
+  # On Unix, the value 11 generally corresponds to a segmentation fault.
+  return res
 #
 
 # Timeout management
 class TimeoutException(Exception):
-  """Execption raised when test timeout is reached."""
+  """Exception raised when test timeout is reached."""
 #
 def timeoutHandler(signum, frame):
   raise TimeoutException()
@@ -61,8 +53,8 @@ if __name__ == "__main__":
   # Add explicit call to python executable if a Python script is passed as
   # first argument
   if not args:
-    print "Invalid arguments for salome_test_helper.py. No command defined."
-    exit(1)
+    print "Invalid arguments for salome_test_driver.py. No command defined."
+    sys.exit(1)
   _, ext = os.path.splitext(args[0])
   if ext == ".py":
     test_and_args = [sys.executable] + args
@@ -75,23 +67,34 @@ if __name__ == "__main__":
 
   # Set timeout handler
   print "Test timeout explicitely set to: %s seconds"%timeout_delay
-  signal.alarm(abs(int(timeout_delay)-10))
-  signal.signal(signal.SIGALRM, timeoutHandler)
+  timeout_sec = abs(int(timeout_delay)-10)
+  if sys.platform == 'win32':
+    from threading import Timer
+    timer = Timer(timeout_sec, timeoutHandler)
+    timer.start()
+  else:
+    signal.alarm(timeout_sec)
+    signal.signal(signal.SIGALRM, timeoutHandler)
 
-  # Run test in a new SALOME session
-  from salome_test_session import startSession, terminateSession
+  # Run test in a new SALOME instance
+  from salome_instance import SalomeInstance
   res = 1
   try:
-    port = startSession()
-    res, out, err = runTest(test_and_args)
-    processResult(res, out, err)
+    salome_instance = SalomeInstance.start(shutdown_servers=True)
+    port = salome_instance.get_port()
+    res = runTest(test_and_args)
   except TimeoutException:
     print "FAILED : timeout(%s) is reached"%timeout_delay
   except:
     import traceback
     traceback.print_exc()
     pass
-
-  terminateSession(port)
-  exit(res)
+  try:
+    salome_instance.stop()
+  except:
+    pass
+  if sys.platform == 'win32':
+    timer.cancel()
+  print "Exit test with status code:", res
+  sys.exit(res)
 #