From 311a8a8f0164daaf609d24e78683935ecb469e5c Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Thu, 15 Jan 2015 17:07:18 +0100 Subject: [PATCH] OK. Only RdOnly and RdExt is now available. --- idl/SALOME_SDS.idl | 2 +- src/SALOMESDS/SALOMESDS_DataServerManager.cxx | 6 ++---- src/SALOMESDS/TestSalomeSDS2.py | 6 ++++++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/idl/SALOME_SDS.idl b/idl/SALOME_SDS.idl index dd2782a40..762f46e01 100644 --- a/idl/SALOME_SDS.idl +++ b/idl/SALOME_SDS.idl @@ -66,7 +66,7 @@ module SALOME void deleteVar(in string varName) raises (SALOME::SALOME_Exception); PickelizedPyObjRdOnlyServer createRdOnlyVar(in string varName, in ByteVec constValue) raises (SALOME::SALOME_Exception); PickelizedPyObjRdExtServer createRdExtVar(in string varName, in ByteVec constValue) raises (SALOME::SALOME_Exception); - PickelizedPyObjRdWrServer createRdWrVar(in string typeName, in string varName) raises (SALOME::SALOME_Exception); + //PickelizedPyObjRdWrServer createRdWrVar(in string typeName, in string varName) raises (SALOME::SALOME_Exception); void shutdownIfNotHostedByDSM(); }; diff --git a/src/SALOMESDS/SALOMESDS_DataServerManager.cxx b/src/SALOMESDS/SALOMESDS_DataServerManager.cxx index 003539143..0193b5076 100644 --- a/src/SALOMESDS/SALOMESDS_DataServerManager.cxx +++ b/src/SALOMESDS/SALOMESDS_DataServerManager.cxx @@ -119,12 +119,10 @@ SALOME::DataScopeServer_ptr DataServerManager::createDataScope(const char *scope // SALOME_NamingService ns(_orb); std::string fullScopeName(CreateAbsNameInNSFromScopeName(scopeName)); - std::ostringstream oss; oss << "valgrind --leak-check=yes SALOME_DataScopeServer" << " " << scopeName << " "; + std::ostringstream oss; oss << "SALOME_DataScopeServer" << " " << scopeName << " "; SALOME_ContainerManager::AddOmninamesParams(oss,&ns); std::string command(oss.str()); - //SALOME_ContainerManager::MakeTheCommandToBeLaunchedASync(command); - command+=" > err.log 2>&1 &"; - std::cerr << "************** " << command << std::endl; + SALOME_ContainerManager::MakeTheCommandToBeLaunchedASync(command); int status(SALOME_ContainerManager::SystemThreadSafe(command.c_str())); int count(SALOME_ContainerManager::GetTimeOutToLoaunchServer()); SALOME::DataScopeServer_var ret(SALOME::DataScopeServer::_nil()); diff --git a/src/SALOMESDS/TestSalomeSDS2.py b/src/SALOMESDS/TestSalomeSDS2.py index 2ad849da6..d4222a991 100644 --- a/src/SALOMESDS/TestSalomeSDS2.py +++ b/src/SALOMESDS/TestSalomeSDS2.py @@ -67,6 +67,12 @@ class SalomeSDS2Test(unittest.TestCase): a._var_ptr.getMyDataScopeServer().deleteVar("a") pass + def testReadOnly1(self): + a=SalomeSDSClt.CreateRdOnlyGlobalVar({"ab":4,"cd":[5,77]},"a","Scope0") + self.assertEqual(a.local_copy(),{"ab":4,"cd":[5,77]}) + self.assertRaises(AttributeError,a.__getitem__,"ab") + a._var_ptr.getMyDataScopeServer().deleteVar("a") + def setUp(self): salome.salome_init() pass -- 2.39.2