3609: Back out setting api_version, api_host, and api_insecure on api client

[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 83b95b898aa53a3a418ee6b76c38a6c8554a2235..25d1d382ec478df90ce585cc9489d553805c7f84 100644 (file)
--- a/sdk/python/tests/test_websockets.py
+++ b/sdk/python/tests/test_websockets.py
@@ -2,54 +2,49 @@ import run_test_server
 import unittest
 import arvados
 import arvados.events
-import time
-
-class WebsocketTest(run_test_server.TestCaseWithServers):
-    MAIN_SERVER = {'websockets': True}
+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)
-        ws = arvados.events.subscribe(api, [['object_uuid', 'is_a', 'arvados#human']], lambda ev: self.on_event(ev))
-        time.sleep(1)
+        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()
-        time.sleep(2)
+        self.done.wait(10)
         self.assertEqual(3, self.state)
-        ws.close()
 
-class PollClientTest(run_test_server.TestCaseWithServers):
-    MAIN_SERVER = {}
+class WebsocketTest(run_test_server.TestCaseWithServers, EventTestBase):
+    MAIN_SERVER = {'websockets': True}
+    WS_TYPE = arvados.events.EventClient
 
-    def on_event(self, ev):
-        if self.state == 1:
-            self.assertEqual(200, ev['status'])
-            self.state = 2
-        elif self.state == 2:
-            self.assertEqual(self.h[u'uuid'], ev[u'object_uuid'])
-            self.state = 3
-        elif self.state == 3:
-            self.fail()
+    def tearDown(self):
+        self.ws.close()
+        super(run_test_server.TestCaseWithServers, self).tearDown()
 
-    def runTest(self):
-        self.state = 1
 
-        run_test_server.authorize_with("admin")
-        api = arvados.api('v1', cache=False)
-        ws = arvados.events.subscribe(api, [['object_uuid', 'is_a', 'arvados#human']], lambda ev: self.on_event(ev), poll_fallback=2)
-        time.sleep(1)
-        self.h = api.humans().create(body={}).execute()
-        time.sleep(5)
-        self.assertEqual(3, self.state)
-        ws.close()
+class PollClientTest(run_test_server.TestCaseWithServers, EventTestBase):
+    MAIN_SERVER = {}
+    WS_TYPE = arvados.events.PollClient
+
+    def tearDown(self):
+        self.ws.close()
+        super(run_test_server.TestCaseWithServers, self).tearDown()