From 91a633e4368edf7884cbcfd0362443b0b49f868c Mon Sep 17 00:00:00 2001
From: =?utf8?q?C=C3=A9dric=20Aguerre?= <cedric.aguerre@edf.fr>
Date: Mon, 18 Apr 2016 18:25:28 +0200
Subject: [PATCH] Remove special process for PARAVIS

---
 .../salome_tester/salome_instance.py          |  4 +-
 .../salome_tester/salome_test_driver.py       | 41 ++++---------------
 .../salome_tester/salome_test_driver_gui.py   |  2 +-
 3 files changed, 10 insertions(+), 37 deletions(-)

diff --git a/bin/appliskel/salome_tester/salome_instance.py b/bin/appliskel/salome_tester/salome_instance.py
index 950ea281c..8fb347e92 100644
--- a/bin/appliskel/salome_tester/salome_instance.py
+++ b/bin/appliskel/salome_tester/salome_instance.py
@@ -57,7 +57,7 @@ class SalomeInstance(object):
   def __run(self, args=None, with_gui=False):
     if args is None:
       args = []
-      
+
     sys.argv = ['runSalome'] + args
 
     if with_gui:
@@ -77,7 +77,7 @@ class SalomeInstance(object):
     setenv.main(True)
     import runSalome
     runSalome.runSalome()
-    
+
     if not with_gui:
       import salome
       salome.salome_init()
diff --git a/bin/appliskel/salome_tester/salome_test_driver.py b/bin/appliskel/salome_tester/salome_test_driver.py
index f2a1fc550..068bf89a0 100644
--- a/bin/appliskel/salome_tester/salome_test_driver.py
+++ b/bin/appliskel/salome_tester/salome_test_driver.py
@@ -38,43 +38,17 @@ def runTest(command):
   return res, out, err
 #
 
-def processResultSpecialParavis(res, out, err):
-  # :TRICKY: Special case of returncode=127
-  # When using paraview in SALOME environment, the following error
-  # systematically appears when exiting paraview (it's also true when using
-  # PARAVIS and exiting SALOME):
-  # Inconsistency detected by ld.so: dl-close.c: 738: _dl_close: Assertion `map->l_init_called' failed!
-  # For PARAVIS tests purpose, paraview functionalities are accessed in each
-  # test; these tests are run in the above subprocess call.
-  # The assertion error implies a subprocess return code of 127, and the test
-  # status is considered as "failed".
-  # The tricky part here is to discard such return codes, waiting for a fix
-  # maybe in paraview...
-  if res == 127 and err.startswith("Inconsistency detected by ld.so: dl-close.c"):
-      print "    ** THE FOLLOWING MESSAGE IS DISCARDED WHEN ANALYZING TEST SUCCESSFULNESS **"
-      print err,
-      print "    ** end of message **"
-      res = 0
-  elif err:
-      print "    ** Detected error **"
-      print "Error code: ", res
-      print err,
-      print "    ** end of message **"
-      pass
-
-  if out:
-      print out
-  return res
-#
-
 # Display output and errors
 def processResult(res, out, err):
   if out:
     print out
     pass
   if err:
-    print err
-  print "Status code: ", res
+    print "    ** Detected error **"
+    print "Error code: ", res
+    print err,
+    print "    ** end of message **"
+    pass
   return res
 #
 
@@ -112,7 +86,7 @@ if __name__ == "__main__":
     from threading import Timer
     timer = Timer(timeout_sec, timeoutHandler)
     timer.start()
-  else:    
+  else:
     signal.alarm(timeout_sec)
     signal.signal(signal.SIGALRM, timeoutHandler)
 
@@ -123,8 +97,7 @@ if __name__ == "__main__":
     salome_instance = SalomeInstance.start(shutdown_servers=True)
     port = salome_instance.get_port()
     res, out, err = runTest(test_and_args)
-    #res = processResult(res, out, err)
-    res = processResultSpecialParavis(res, out, err)
+    res = processResult(res, out, err)
   except TimeoutException:
     print "FAILED : timeout(%s) is reached"%timeout_delay
   except:
diff --git a/bin/appliskel/salome_tester/salome_test_driver_gui.py b/bin/appliskel/salome_tester/salome_test_driver_gui.py
index de4fbc5f4..284f9e624 100644
--- a/bin/appliskel/salome_tester/salome_test_driver_gui.py
+++ b/bin/appliskel/salome_tester/salome_test_driver_gui.py
@@ -57,7 +57,7 @@ if __name__ == "__main__":
     from threading import Timer
     timer = Timer(timeout_sec, timeoutHandler)
     timer.start()
-  else:    
+  else:
     signal.alarm(timeout_sec)
     signal.signal(signal.SIGALRM, timeoutHandler)
 
-- 
2.39.2