IF(NOT WIN32)
SET(TEST_NAME ${COMPONENT_NAME}_Py2YacsTest)
# Need a salome session for this test
- ADD_TEST(${TEST_NAME} ${SALOME_TEST_DRIVER} ${TIMEOUT} ./TestPy2yacs)
+ ADD_TEST(${TEST_NAME} ./TestPy2yacs)
SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
LABELS "${COMPONENT_NAME}"
+ ENVIRONMENT "SALOME_EMB_SERVANT=1"
)
SET(TEST_NAME ${COMPONENT_NAME}_PyDecorator)
- ADD_TEST(${TEST_NAME} ${SALOME_TEST_DRIVER} ${TIMEOUT} testDeco.py)
+ ADD_TEST(${TEST_NAME} testDeco.py)
SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
LABELS "${COMPONENT_NAME}"
+ ENVIRONMENT "SALOME_EMB_SERVANT=1"
)
ENDIF()
SalomeContainerTools tempSct = _sct;
tempSct.setProperty("name", resource_name);
tempSct.setProperty("container_name", container_name);
- //SalomeContainerTools::Start(_componentNames,_launchModeType,tempSct,_shutdownLevel,this,askingNode);
// components are not supported yet on this kind of start
std::vector<std::string> noComponentNames;
- int shutdownLevel = 999;
- SalomeContainerTools::Start(noComponentNames,_launchModeType,tempSct,shutdownLevel,this,askingNode);
+ SalomeContainerTools::Start(noComponentNames,_launchModeType,tempSct,_shutdownLevel,this,askingNode);
}
else
start(askingNode);
ENVIRONMENT "LD_LIBRARY_PATH=${YACS_TEST_LIB}:$ENV{LD_LIBRARY_PATH}")
SET(TEST_NAME ${COMPONENT_NAME}_YacsPMMLExeTest)
- ADD_TEST(${TEST_NAME} ${SALOME_TEST_DRIVER} ${TIMEOUT} ./TestYACSPMML)
- SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
+ ADD_TEST(${TEST_NAME} ./TestYACSPMML)
+ SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
+ LABELS "${COMPONENT_NAME}"
+ ENVIRONMENT "SALOME_EMB_SERVANT=1"
+ )
ENDIF()
myArgs.dump = 0;
myArgs.loadState = (char *)"";
myArgs.xmlSchema = (char *)"";
- myArgs.shutdown = 1;
+ myArgs.shutdown = 10;
myArgs.reset = 0;
myArgs.killPort = 0;
myArgs.init_ports.clear();
)
SET(TEST_NAME ${COMPONENT_NAME}_StdAloneYacsLoaderTest1)
- ADD_TEST(${TEST_NAME} ${SALOME_TEST_DRIVER} ${TIMEOUT} StdAloneYacsLoaderTest1.py)
+ ADD_TEST(${TEST_NAME} StdAloneYacsLoaderTest1.py)
SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
LABELS "${COMPONENT_NAME}"
+ ENVIRONMENT "SALOME_EMB_SERVANT=1"
)
SET(TEST_NAME ${COMPONENT_NAME}_PyNodeWithCache_swig)
- ADD_TEST(${TEST_NAME} ${SALOME_TEST_DRIVER} ${TIMEOUT} testPynodeWithCache.py)
+ ADD_TEST(${TEST_NAME} testPynodeWithCache.py)
SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
LABELS "${COMPONENT_NAME}"
+ ENVIRONMENT "SALOME_EMB_SERVANT=1"
)
SET(TEST_NAME ${COMPONENT_NAME}_WorkloadManager_swig)
- ADD_TEST(${TEST_NAME} ${SALOME_TEST_DRIVER} ${TIMEOUT} testWorkloadManager.py)
+ ADD_TEST(${TEST_NAME} testWorkloadManager.py)
SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
LABELS "${COMPONENT_NAME}"
+ ENVIRONMENT "SALOME_EMB_SERVANT=1"
+ )
+
+ SET(TEST_NAME ${COMPONENT_NAME}_Progress_swig)
+ ADD_TEST(${TEST_NAME} testProgress.py)
+ SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
+ LABELS "${COMPONENT_NAME}"
+ ENVIRONMENT "SALOME_EMB_SERVANT=1"
+ )
+
+ SET(TEST_NAME ${COMPONENT_NAME}_Refcount_swig)
+ ADD_TEST(${TEST_NAME} testRefcount.py)
+ SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
+ LABELS "${COMPONENT_NAME}"
+ ENVIRONMENT "SALOME_EMB_SERVANT=1"
+ )
+
+ SET(TEST_NAME ${COMPONENT_NAME}_Resume_swig)
+ ADD_TEST(${TEST_NAME} testResume.py)
+ SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
+ LABELS "${COMPONENT_NAME}"
+ ENVIRONMENT "SALOME_EMB_SERVANT=1"
+ )
+
+ SET(TEST_NAME ${COMPONENT_NAME}_SaveLoadRun_swig)
+ ADD_TEST(${TEST_NAME} testSaveLoadRun.py)
+ SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
+ LABELS "${COMPONENT_NAME}"
+ ENVIRONMENT "SALOME_EMB_SERVANT=1"
+ )
+
+ SET(TEST_NAME ${COMPONENT_NAME}_ValidationChecks_swig)
+ ADD_TEST(${TEST_NAME} testValidationChecks.py)
+ SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
+ LABELS "${COMPONENT_NAME}"
+ ENVIRONMENT "SALOME_EMB_SERVANT=1"
)
ENDIF()
export TESTCOMPONENT_ROOT_DIR=`pwd`/../runtime
#python3 -m unittest discover
-MODULES_TO_TEST="testEdit testExec testLoader testProgress testRefcount \
-testResume testSave testSaveLoadRun testValidationChecks"
+MODULES_TO_TEST="testEdit testExec testLoader testSave "
python3 -m unittest $MODULES_TO_TEST
ret=$?
if __name__ == '__main__':
+ import tempfile
import os
- U = os.getenv('USER')
- with open("/tmp/" + U + "/UnitTestsResult", 'a') as f:
+ dir_test = tempfile.mkdtemp(suffix=".yacstest")
+ file_test = os.path.join(dir_test,"UnitTestsResult")
+ with open(file_test, 'a') as f:
f.write(" --- TEST src/yacsloader: testEdit.py\n")
suite = unittest.makeSuite(TestEdit)
result=unittest.TextTestRunner(f, descriptions=1, verbosity=1).run(suite)
pass
if __name__ == '__main__':
- import os
- import sys
- U = os.getenv('USER')
- with open(os.path.join("/tmp", U, "UnitTestsResult"), 'a') as f:
+ dir_test = tempfile.mkdtemp(suffix=".yacstest")
+ file_test = os.path.join(dir_test,"UnitTestsResult")
+ with open(file_test, 'a') as f:
f.write(" --- TEST src/yacsloader: testExec.py\n")
suite = unittest.makeSuite(TestExec)
result = unittest.TextTestRunner(f, descriptions=1, verbosity=1).run(suite)
- sys.exit(not result.wasSuccessful())
+ sys.exit(not result.wasSuccessful())
import pilot
import os
+import tempfile
class TestExecForEachGeoMesh(unittest.TestCase):
pass
if __name__ == '__main__':
- import os
- import sys
- U = os.getenv('USER')
- with open(os.path.join("/tmp", U, "UnitTestsResult"), 'a') as f:
+ dir_test = tempfile.mkdtemp(suffix=".yacstest")
+ file_test = os.path.join(dir_test,"UnitTestsResult")
+ with open(file_test, 'a') as f:
f.write(" --- TEST src/yacsloader: testExec.py\n")
suite = unittest.makeSuite(TestExecForEachGeoMesh)
result = unittest.TextTestRunner(f, descriptions=1, verbosity=1).run(suite)
- sys.exit(not result.wasSuccessful())
+ sys.exit(not result.wasSuccessful())
+#!/usr/bin/env python3
# Copyright (C) 2006-2021 CEA/DEN, EDF R&D
#
# This library is free software; you can redistribute it and/or
pass
if __name__ == '__main__':
+ import tempfile
import os
- U = os.getenv('USER')
- with open("/tmp/" + U + "/UnitTestsResult", 'a') as f:
+ dir_test = tempfile.mkdtemp(suffix=".yacstest")
+ file_test = os.path.join(dir_test,"UnitTestsResult")
+ with open(file_test, 'a') as f:
f.write(" --- TEST src/yacsloader: testLoader.py\n")
suite = unittest.makeSuite(TestLoader)
result=unittest.TextTestRunner(f, descriptions=1, verbosity=1).run(suite)
+#!/usr/bin/env python3
# Copyright (C) 2006-2021 CEA/DEN, EDF R&D
#
# This library is free software; you can redistribute it and/or
myRun.join()
self.assertEqual(p.getState(),pilot.DONE)
self.assertEqual(p.getGlobalProgressPercent(),100)
-
+
if __name__ == '__main__':
+ import tempfile
import os
- U = os.getenv('USER')
- with open("/tmp/" + U + "/UnitTestsResult", 'a') as f:
+ dir_test = tempfile.mkdtemp(suffix=".yacstest")
+ file_test = os.path.join(dir_test,"UnitTestsResult")
+ with open(file_test, 'a') as f:
f.write(" --- TEST src/yacsloader: testProgress.py\n")
suite = unittest.makeSuite(TestEdit)
result=unittest.TextTestRunner(f, descriptions=1, verbosity=3).run(suite)
+#!/usr/bin/env python3
# Copyright (C) 2006-2021 CEA/DEN, EDF R&D
#
# This library is free software; you can redistribute it and/or
self.assertEqual(tc.getRefCnt(), 3)
if __name__ == '__main__':
+ import tempfile
import os
- U = os.getenv('USER')
- with open("/tmp/" + U + "/UnitTestsResult", 'a') as f:
+ dir_test = tempfile.mkdtemp(suffix=".yacstest")
+ file_test = os.path.join(dir_test,"UnitTestsResult")
+ with open(file_test, 'a') as f:
f.write(" --- TEST src/yacsloader: testRefcount.py\n")
suite1 = unittest.makeSuite(TestContainerRef)
suite2 = unittest.makeSuite(TestTypeCodeRef)
import SALOMERuntime
import loader
import pilot
+import salome
class TestResume(unittest.TestCase):
self.statefile = os.path.join(workdir, 'dumpPartialBloc2.xml')
pass
+ def tearDown(self):
+ salome.salome_init()
+ cm = salome.lcc.getContainerManager()
+ cm.ShutdownContainers()
+ pass
+
def test1_PartialExec(self):
# --- stop execution after breakpoint
time.sleep(1)
pass
if __name__ == '__main__':
- import os
- U = os.getenv('USER')
- with open("/tmp/" + U + "/UnitTestsResult", 'a') as f:
+ dir_test = tempfile.mkdtemp(suffix=".yacstest")
+ file_test = os.path.join(dir_test,"UnitTestsResult")
+ with open(file_test, 'a') as f:
f.write(" --- TEST src/yacsloader: testResume.py\n")
suite = unittest.makeSuite(TestResume)
result=unittest.TextTestRunner(f, descriptions=1, verbosity=1).run(suite)
pass
if __name__ == '__main__':
- import os
- U = os.getenv('USER')
- with open("/tmp/" + U + "/UnitTestsResult", 'a') as f:
+ dir_test = tempfile.mkdtemp(suffix=".yacstest")
+ file_test = os.path.join(dir_test,"UnitTestsResult")
+ with open(file_test, 'a') as f:
f.write(" --- TEST src/yacsloader: testSave.py\n")
suite = unittest.makeSuite(TestSave)
result=unittest.TextTestRunner(f, descriptions=1, verbosity=1).run(suite)
+#!/usr/bin/env python3
# Copyright (C) 2006-2021 CEA/DEN, EDF R&D
#
# This library is free software; you can redistribute it and/or
import pilot
import SALOMERuntime
import loader
+import salome
import datetime
self.workdir = tempfile.mkdtemp(suffix=".yacstest")
pass
+ def tearDown(self):
+ salome.salome_init()
+ cm = salome.lcc.getContainerManager()
+ cm.ShutdownContainers()
+ salome.dsm.shutdownScopes()
+ pass
+
def test0(self):
"""First test of HP Container no loop here only the 3 sorts of python nodes (the Distributed is it still used and useful ?) """
fname=os.path.join(self.workdir, "TestSaveLoadRun0.xml")
p=self.r.createProc("pr")
ti=p.createType("int","int")
cont=p.createContainer("DefaultContainer","Salome")
+ # enable WorkloadManager mode because containers are not registered right
+ # in classical mode (4 containers with the same name are launched at the
+ # same time).
+ p.setProperty("executor", "WorkloadManager")
+ cont.setProperty("type", "multi")
cont.setProperty("container_name","FactoryServer")
b=self.r.createBloc("Bloc") ; p.edAddChild(b)
#
cont1.setProperty("name","localhost")
cont1.setProperty("hostname","localhost")
cont1.setProperty("type","multi")
- cont1.setProperty("container_name","container1@")
+ cont1.setProperty("container_name","container1")
#
cont2=p.createContainer("cont2","Salome")
cont2.setProperty("name","localhost")
cont2.setProperty("hostname","localhost")
cont2.setProperty("type","multi")
- cont2.setProperty("container_name","container2@")
+ cont2.setProperty("container_name","container2")
#
td=p.createType("double","double")
ti=p.createType("int","int")
return pickle.loads(strr)
salome.salome_init()
-dsm=salome.naming_service.Resolve("/DataServerManager")
+#dsm=salome.naming_service.Resolve("/DataServerManager")
+dsm = salome.dsm
dss,isCreated=dsm.giveADataScopeTransactionCalled(scopeName)
assert(not isCreated)
wk2.waitFor()
assert(str2Obj(dss.waitForMonoThrRev(wk2))==[11,12])""")
n1.setContainer(cont1)
+ n1.setExecutionMode("remote")
#
n2=r.createScriptNode("","n2")
n2_sn=n2.edAddInputPort("scopeName",ts)
return pickle.loads(strr)
salome.salome_init()
-dsm=salome.naming_service.Resolve("/DataServerManager")
+#dsm=salome.naming_service.Resolve("/DataServerManager") #doesn't work in ssl
+dsm = salome.dsm # works in ssl
dss,isCreated=dsm.giveADataScopeTransactionCalled(scopeName)
assert(not isCreated)
time.sleep(3.)
t1.addKeyValueInVarErrorIfAlreadyExistingNow(obj2Str("ef"),obj2Str([11,12]))
""")
n2.setContainer(cont2)
+ n2.setExecutionMode("remote")
#
p.edAddChild(n0)
p.edAddChild(n1)
pass
if __name__ == '__main__':
- import os,sys
- U = os.getenv('USER')
- with open("/tmp/" + U + "/UnitTestsResult", 'a') as f:
+ dir_test = tempfile.mkdtemp(suffix=".yacstest")
+ file_test = os.path.join(dir_test,"UnitTestsResult")
+ with open(file_test, 'a') as f:
f.write(" --- TEST src/yacsloader: testSaveLoadRun.py\n")
suite = unittest.makeSuite(TestSaveLoadRun)
result=unittest.TextTestRunner(f, descriptions=1, verbosity=1).run(suite)
