fixes to broken int tests

ooici · Oct 18, 2012 · 09f6f52 · 09f6f52
1 parent 6f64c62
commit 09f6f52
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/ion/services/sa/instrument/test/test_instrument_management_service_integration.py b/ion/services/sa/instrument/test/test_instrument_management_service_integration.py
@@ -1,7 +1,9 @@
 from interface.services.icontainer_agent import ContainerAgentClient
 
 #from pyon.ion.endpoint import ProcessRPCClient
+from ion.services.sa.resource_impl.resource_impl import ResourceImpl
 from pyon.public import Container, log, IonObject
+from pyon.util.containers import DotDict
 from pyon.util.int_test import IonIntegrationTestCase
 
 from interface.services.coi.iresource_registry_service import ResourceRegistryServiceClient
@@ -168,7 +170,14 @@ def addInstOwner(inst_id, subject):
 
 
         # cleanup
-        #self.IMS.force_delete_instrument_agent(instrument_agent_id)
+        c = DotDict()
+        c.resource_registry = self.RR
+        resource_impl = ResourceImpl(c)
+        resource_impl.pluck(instrument_agent_id)
+        resource_impl.pluck(instrument_model_id)
+        resource_impl.pluck(instrument_device_id)
+        resource_impl.pluck(platform_agent_id)
+        self.IMS.force_delete_instrument_agent(instrument_agent_id)
         self.IMS.force_delete_instrument_model(instrument_model_id)
         self.IMS.force_delete_instrument_device(instrument_device_id)
         self.IMS.force_delete_platform_agent_instance(platform_agent_instance_id)

diff --git a/ion/services/sa/observatory/test/test_deployment.py b/ion/services/sa/observatory/test/test_deployment.py
@@ -1,5 +1,6 @@
 #from interface.services.icontainer_agent import ContainerAgentClient
 #from pyon.ion.endpoint import ProcessRPCClient
+from ion.services.sa.resource_impl.resource_impl import ResourceImpl
 from pyon.public import Container, log, IonObject
 from pyon.util.containers import DotDict
 from pyon.util.int_test import IonIntegrationTestCase
@@ -53,6 +54,11 @@ def setUp(self):
         self.damsclient = DataAcquisitionManagementServiceClient(node=self.container.node)
         self.psmsclient = PubsubManagementServiceClient(node=self.container.node)
 
+        self.c = DotDict()
+        self.c.resource_registry = self.rrclient
+        self.resource_impl = ResourceImpl(self.c)
+
+
     #@unittest.skip("targeting")
     def test_create_deployment(self):
 
@@ -91,7 +97,8 @@ def test_create_deployment(self):
         self.assertEqual(len(device_ids), 1)
 
         #delete the deployment
-        self.omsclient.delete_deployment(deployment_id)
+        self.resource_impl.pluck(deployment_id)
+        self.omsclient.force_delete_deployment(deployment_id)
         # now try to get the deleted dp object
         try:
             deployment_obj = self.omsclient.read_deployment(deployment_id)

diff --git a/ion/services/sa/test/test_assembly.py b/ion/services/sa/test/test_assembly.py
@@ -703,6 +703,7 @@ def template_tst_deployment_context(self, context=None):
         c2 = DotDict()
         c2.resource_registry = self.client.RR
         instrument_site_impl = InstrumentSiteImpl(c2)
+        resource_impl = ResourceImpl(c2)
 
         log.info("Create a instrument model")
         instrument_model_id = self.generic_fcruf_script(RT.InstrumentModel,
@@ -767,6 +768,9 @@ def template_tst_deployment_context(self, context=None):
         c.OMS.activate_deployment(deployment_id, True)
 
         # cleanup
+        resource_impl.pluck(instrument_model_id)
+        resource_impl.pluck(deployment_id)
+        resource_impl.pluck(instrument_device_id)
         c.IMS.force_delete_instrument_model(instrument_model_id)
         c.IMS.force_delete_instrument_device(instrument_device_id)
         c.OMS.force_delete_instrument_site(instrument_site_id)