]> SALOME platform Git repositories - modules/kernel.git/commitdiff
Salome HOME
OK. Only RdOnly and RdExt is now available. agy/evol8193
authorAnthony Geay <anthony.geay@edf.fr>
Thu, 15 Jan 2015 16:07:18 +0000 (17:07 +0100)
committerAnthony Geay <anthony.geay@edf.fr>
Thu, 15 Jan 2015 16:07:18 +0000 (17:07 +0100)
idl/SALOME_SDS.idl
src/SALOMESDS/SALOMESDS_DataServerManager.cxx
src/SALOMESDS/TestSalomeSDS2.py

index dd2782a40f844de58693b82ea9fa4a0b35ace922..762f46e01e7ab646941efc439cfb2e5baaf6dbac 100644 (file)
@@ -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();
   };
 
index 003539143d9ffd477fb913994afd7b01342fd378..0193b507661a6136c48e8ebd1917ce461145355a 100644 (file)
@@ -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());
index 2ad849da6214975755b100d7be820d6fde518d16..d4222a9919a9f5e7c3431514b8775ae6c24fff9b 100644 (file)
@@ -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