Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
To fix salome test test.hdfs. Prevent a crash in case aDoc does not exist
[modules/shaper.git]
/
test.hdfs
/
test_hdf.py
diff --git
a/test.hdfs/test_hdf.py
b/test.hdfs/test_hdf.py
index b58ea3b838ef5b39dfdd3e35d9917a70c5145b57..8911735b3efc61040c90c8799e33acecd664515f 100644
(file)
--- a/
test.hdfs/test_hdf.py
+++ b/
test.hdfs/test_hdf.py
@@
-1,4
+1,4
@@
-# Copyright (C) 2014-202
0 CEA/DEN, EDF R&D
+# Copyright (C) 2014-202
3 CEA, EDF
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@
-32,13
+32,8
@@
class TestHDF(unittest.TestCase):
reffile = ""
def setUp(self):
reffile = ""
def setUp(self):
- salome.salome_close()
-
- # leave file name only (trim path and extension)
- fileName = os.path.basename(self.testfile)
- self.reffile = self.reffile + "/" + os.path.splitext(fileName)[0] + ".py"
-
- salome.salome_init(self.testfile, embedded=1)
+ salome.standalone()
+ salome.salome_init(self.testfile, embedded=1, forced=True)
myStudyName = salome.myStudy._get_Name()
self.session = salome.naming_service.Resolve('/Kernel/Session')
self.session.emitMessage("connect_to_study")
myStudyName = salome.myStudy._get_Name()
self.session = salome.naming_service.Resolve('/Kernel/Session')
self.session.emitMessage("connect_to_study")
@@
-69,6
+64,10
@@
class TestHDF(unittest.TestCase):
self.session.setActiveDocument(self.partSet)
self.session.finishOperation()
self.session.setActiveDocument(self.partSet)
self.session.finishOperation()
+ # Check that the features are not in error
+ Part_1_doc = aPart.partDoc()
+
+ model.checkFeaturesValidity(Part_1_doc)
# check reference data
exec(open(self.reffile, "rb").read(), globals(), aPartsList)
# check reference data
exec(open(self.reffile, "rb").read(), globals(), aPartsList)
@@
-77,23
+76,19
@@
if __name__ == "__main__":
if len(sys.argv) > 1:
TestHDF.testfile = sys.argv[1]
if len(sys.argv) > 2:
if len(sys.argv) > 1:
TestHDF.testfile = sys.argv[1]
if len(sys.argv) > 2:
-
salomePortF
ile = sys.argv[2]
+
TestHDF.reff
ile = sys.argv[2]
if len(sys.argv) > 3:
errFile = open(sys.argv[3], 'w')
if len(sys.argv) > 3:
errFile = open(sys.argv[3], 'w')
- if len(sys.argv) > 4:
- salomeKernelDir = sys.argv[4]
- if len(sys.argv) > 5:
- TestHDF.reffile = sys.argv[5]
+ else:
+ # to ease debugging, display the log in embedded python console if no log file is provided
+ # when calling salome in command line for instance
+ # runSalome.py --splash 0 test_hdf.py args:BearingSeparator.hdf,BearingSeparator.py
+ errFile = None
aTest = unittest.TestLoader().loadTestsFromTestCase(TestHDF)
unittest.TextTestRunner(stream=errFile).run(aTest)
aTest = unittest.TestLoader().loadTestsFromTestCase(TestHDF)
unittest.TextTestRunner(stream=errFile).run(aTest)
- errFile.close()
-
- # close Salome GUI
- port = salome_utils.getPortNumber()
- proc = subprocess.Popen([salomeKernelDir + "/bin/salome/killSalomeWithPort.py", "{}".format(port)])
+ if errFile:
+ errFile.close()
- try:
- os.remove(salomePortFile)
- except:
- print("Cannot remove file", file=f)
+ # Quit SALOME the clean way
+ sys.exit()