5037: Fix tearDown error handling in PySDK Websockets test.

[arvados.git] / sdk / python / tests / test_websockets.py

diff --git a/sdk/python/tests/test_websockets.py b/sdk/python/tests/test_websockets.py
index 25d1d382ec478df90ce585cc9489d553805c7f84..45dd28a1575f416989b42ee18cc53e35d826f3b4 100644 (file)
--- a/sdk/python/tests/test_websockets.py
+++ b/sdk/python/tests/test_websockets.py
@@ -1,3 +1,4 @@
+import Queue
 import run_test_server
 import unittest
 import arvados
@@ -5,46 +6,31 @@ import arvados.events
 import threading
 
 class EventTestBase(object):
-    def on_event(self, ev):
-        if self.state == 1:
-            self.assertEqual(200, ev['status'])
-            self.state = 2
-            self.subscribed.set()
-        elif self.state == 2:
-            self.assertEqual(self.h[u'uuid'], ev[u'object_uuid'])
-            self.state = 3
-            self.done.set()
-        elif self.state == 3:
-            self.fail()
-
     def runTest(self):
-        self.state = 1
-        self.subscribed = threading.Event()
-        self.done = threading.Event()
-
         run_test_server.authorize_with("admin")
-        api = arvados.api('v1', cache=False)
-        self.ws = arvados.events.subscribe(arvados.api('v1', cache=False), [['object_uuid', 'is_a', 'arvados#human']], self.on_event, poll_fallback=2)
-        if not isinstance(self.ws, self.WS_TYPE):
-            self.fail()
-        self.subscribed.wait(10)
-        self.h = api.humans().create(body={}).execute()
-        self.done.wait(10)
-        self.assertEqual(3, self.state)
+        events = Queue.Queue(3)
+        self.ws = arvados.events.subscribe(
+            arvados.api('v1'), [['object_uuid', 'is_a', 'arvados#human']],
+            events.put, poll_fallback=2)
+        self.assertIsInstance(self.ws, self.WS_TYPE)
+        self.assertEqual(200, events.get(True, 10)['status'])
+        human = arvados.api('v1').humans().create(body={}).execute()
+        self.assertEqual(human['uuid'], events.get(True, 10)['object_uuid'])
+        self.assertTrue(events.empty(), "got more events than expected")
+
+    def tearDown(self):
+        try:
+            self.ws.close()
+        except AttributeError:
+            pass
+        super(EventTestBase, self).tearDown()
+
 
-class WebsocketTest(run_test_server.TestCaseWithServers, EventTestBase):
+class WebsocketTest(EventTestBase, run_test_server.TestCaseWithServers):
     MAIN_SERVER = {'websockets': True}
     WS_TYPE = arvados.events.EventClient
 
-    def tearDown(self):
-        self.ws.close()
-        super(run_test_server.TestCaseWithServers, self).tearDown()
-
 
-class PollClientTest(run_test_server.TestCaseWithServers, EventTestBase):
+class PollClientTest(EventTestBase, run_test_server.TestCaseWithServers):
     MAIN_SERVER = {}
     WS_TYPE = arvados.events.PollClient
-
-    def tearDown(self):
-        self.ws.close()
-        super(run_test_server.TestCaseWithServers, self).tearDown()