Merge branch '3609-arv-ws' into 3609-arv-run

[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 1dae978c843b052a19469c1e8dfc0ee876a0ede9..83b95b898aa53a3a418ee6b76c38a6c8554a2235 100644 (file)
--- a/sdk/python/tests/test_websockets.py
+++ b/sdk/python/tests/test_websockets.py
@@ -22,7 +22,34 @@ class WebsocketTest(run_test_server.TestCaseWithServers):
 
         run_test_server.authorize_with("admin")
         api = arvados.api('v1', cache=False)
-        arvados.events.subscribe(api, [['object_uuid', 'is_a', 'arvados#human']], lambda ev: self.on_event(ev))
+        ws = arvados.events.subscribe(api, [['object_uuid', 'is_a', 'arvados#human']], lambda ev: self.on_event(ev))
         time.sleep(1)
         self.h = api.humans().create(body={}).execute()
+        time.sleep(2)
+        self.assertEqual(3, self.state)
+        ws.close()
+
+class PollClientTest(run_test_server.TestCaseWithServers):
+    MAIN_SERVER = {}
+
+    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 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()