Merge branch 'master' of https://codev-tuleap.cea.fr/plugins/git/salome/shaper

diff --git a/env.sh b/env.sh
index 9e1c4e20553a65dc1c9494daeaf6a20b7e235a00..8fe5af0083af31f54f7db71865326fdbac801e7a 100644 (file)
--- a/env.sh
+++ b/env.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -x
 
-export SALOME_DIR=/dn46/SALOME/series9x/current-2020-03-31
+export SALOME_DIR=/dn46/SALOME/series9x/current-2020-04-07
 
 # Path to sources
 export SOURCES_DIR=$(pwd)

diff --git a/test.hdfs/test.py b/test.hdfs/test.py
index 69b88b668745590f02d826913e9762816947eaf6..0c2f27e7a1745a84e2581f92e1c215190686a4cb 100644 (file)
--- a/test.hdfs/test.py
+++ b/test.hdfs/test.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 if __name__ == '__main__':
 
-  from subprocess import Popen
+  import subprocess
   from time import sleep
   import sys, os
 
@@ -17,25 +17,26 @@ if __name__ == '__main__':
   except:
     pass
 
-  proc = Popen([salomeKernelDir + "/bin/salome/runSalome.py", "--modules", "SHAPER,GEOM", "--gui", "--ns-port-log=" + portlogfile, sourceDir + "/test_hdf.py", "args:" + testfile + "," + portlogfile + "," + testlogfile + "," + salomeKernelDir + "," + sourceDir])
-
-  iter = 0
-  while not os.path.exists(portlogfile) and iter < 100:
-    sleep(0.1)
-    iter += 1
+  isOk = True
+  error = ""
 
-  while os.path.exists(portlogfile):
-    sleep(0.1)
+  proc = subprocess.Popen([salomeKernelDir + "/bin/salome/runSalome.py", "--modules", "SHAPER,GEOM", "--gui", "--ns-port-log=" + portlogfile, sourceDir + "/test_hdf.py", "args:" + testfile + "," + portlogfile + "," + testlogfile + "," + salomeKernelDir + "," + sourceDir], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+  try:
+    proc.communicate(timeout = 300)
+  except TimeoutExpired:
+    isOk = False
+    proc.kill()
+    out, err = proc.communicate()
+    error = "Killed by CPU limit."
+    print(err)
 
-  isOk = True
   with open(testlogfile, 'r') as inputFile:
     s = inputFile.read()
     print(s)
-    for line in s:
-      isOk = isOk and s.find("FAIL") < 0
+    isOk = isOk and s.find("FAIL") < 0
   try:
     os.remove(testlogfile)
   except:
     pass
 
-  assert isOk, "Test failed"
+  assert isOk, "Test failed. {}".format(error)