From dc3f2294ad5a402e91d590195542c2f45acf5d27 Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 6 Aug 2013 08:37:06 +0000 Subject: [PATCH] Fix problems with running PARAVIS tests --- test/VisuPrs/Util/paravistest.py | 14 +++----------- test/VisuPrs/Util/paravistesthelper.py | 9 ++++++++- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/test/VisuPrs/Util/paravistest.py b/test/VisuPrs/Util/paravistest.py index 8c7f89a9..82733ff0 100755 --- a/test/VisuPrs/Util/paravistest.py +++ b/test/VisuPrs/Util/paravistest.py @@ -81,7 +81,9 @@ class SalomeSession(object): #sys.argv += ["--portkill=" + port] sys.argv += ["--show-desktop=1"] sys.argv += ["--splash=0"] - sys.argv += ["--modules=MED,VISU,PARAVIS"] + sys.argv += ["--modules=MED,PARAVIS"] + sys.argv += ["--standalone=study"] + sys.argv += ["--embedded=SalomeAppEngine,cppContainer,registry,moduleCatalog"] clt, d = runSalome.main() port = d['port'] self.port = port @@ -193,13 +195,3 @@ def setShaded(view, shading): # Run Salome salome_session = SalomeSession() salome.salome_init() - -# Create new study -print "Creating new study...", -aStudy = salome.myStudyManager.NewStudy("Study1") -if aStudy is None: - raise RuntimeError("FAILED") -else: - print "OK" - -salome.myStudy = aStudy diff --git a/test/VisuPrs/Util/paravistesthelper.py b/test/VisuPrs/Util/paravistesthelper.py index 67611a4b..5b008981 100644 --- a/test/VisuPrs/Util/paravistesthelper.py +++ b/test/VisuPrs/Util/paravistesthelper.py @@ -1,9 +1,16 @@ import searchFreePort import subprocess -import sys +import sys, os import signal import killSalomeWithPort +## TEMP >>> ### +if not os.getenv("OMNIORB_USER_PATH"): + os.environ["OMNIORB_USER_PATH"] = os.path.realpath(os.path.expanduser('~')) + pass +## <<< TEMP ### + + args = {} searchFreePort.searchFreePort(args) port = args['port'] -- 2.39.2