Updated IA test to use CFG timeout on async events.

ooici · Oct 3, 2012 · f033e3b · f033e3b
1 parent 5968d22
commit f033e3b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/ion/agents/instrument/test/test_instrument_agent.py b/ion/agents/instrument/test/test_instrument_agent.py
@@ -521,7 +521,7 @@ def test_initialize(self):
         Test agent initialize command. This causes creation of
         driver process and transition to inactive.
         """
-        
+
         # We start in uninitialized state.
         # In this state there is no driver process.
         state = self._ia_client.get_agent_state()
@@ -601,7 +601,7 @@ def test_resource_states(self):
         with self.assertRaises(Conflict):
             res_state = self._ia_client.get_resource_state()
 
-        self._async_event_result.get(timeout=10)
+        self._async_event_result.get(timeout=CFG.endpoint.receive.timeout)
         self.assertGreaterEqual(len(self._events_received), 6)
 
     def test_states(self):
@@ -669,7 +669,7 @@ def test_states(self):
         state = self._ia_client.get_agent_state()
         self.assertEqual(state, ResourceAgentState.UNINITIALIZED)
 
-        self._async_event_result.get(timeout=10)
+        self._async_event_result.get(timeout=CFG.endpoint.receive.timeout)
         self.assertEquals(len(self._events_received), 8)
 
     def test_get_set(self):
@@ -734,7 +734,7 @@ def test_get_set(self):
         state = self._ia_client.get_agent_state()
         self.assertEqual(state, ResourceAgentState.UNINITIALIZED)
 
-        self._async_event_result.get(timeout=10)
+        self._async_event_result.get(timeout=CFG.endpoint.receive.timeout)
         self.assertEquals(len(self._events_received), 3)
 
 
@@ -890,10 +890,10 @@ def test_poll(self):
         state = self._ia_client.get_agent_state()
         self.assertEqual(state, ResourceAgentState.UNINITIALIZED)
 
-        self._async_event_result.get(timeout=10)
+        self._async_event_result.get(timeout=CFG.endpoint.receive.timeout)
         self.assertEquals(len(self._events_received), 7)
 
-        self._async_sample_result.get(timeout=10)
+        self._async_sample_result.get(timeout=CFG.endpoint.receive.timeout)
         self.assertEquals(len(self._samples_received), 6)
 
     def test_autosample(self):
@@ -941,10 +941,10 @@ def test_autosample(self):
         state = self._ia_client.get_agent_state()
         self.assertEqual(state, ResourceAgentState.UNINITIALIZED)
 
-        self._async_event_result.get(timeout=10)
+        self._async_event_result.get(timeout=CFG.endpoint.receive.timeout)
         self.assertGreaterEqual(len(self._events_received), 6)
 
-        self._async_sample_result.get(timeout=10)
+        self._async_sample_result.get(timeout=CFG.endpoint.receive.timeout)
         self.assertGreaterEqual(len(self._samples_received), 6)
 
     def test_capabilities(self):
@@ -1334,7 +1334,7 @@ def test_command_errors(self):
         state = self._ia_client.get_agent_state()
         self.assertEqual(state, ResourceAgentState.UNINITIALIZED)
 
-        self._async_event_result.get(timeout=10)
+        self._async_event_result.get(timeout=CFG.endpoint.receive.timeout)
         self.assertEquals(len(self._events_received), 6)
 
     def test_direct_access(self):

diff --git a/ion/services/sa/tcaa/test/test_remote_endpoint.py b/ion/services/sa/tcaa/test/test_remote_endpoint.py
@@ -487,5 +487,3 @@ def test_service_commands(self):
         # This will cause the endpoint clients to disconnect and go to sleep.
         self.on_link_down()
 
-
-