X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/1e2e0e4f14a730ba1bbea6a4ced5d87ea2766c35..372aaff2b572ce772fafc506e9c57d465eb823f6:/sdk/python/tests/test_websockets.py

diff --git a/sdk/python/tests/test_websockets.py b/sdk/python/tests/test_websockets.py
index 45dd28a157..d879ebe1f8 100644
--- a/sdk/python/tests/test_websockets.py
+++ b/sdk/python/tests/test_websockets.py
@@ -3,34 +3,38 @@ import run_test_server
 import unittest
 import arvados
 import arvados.events
+import mock
 import threading
 
-class EventTestBase(object):
-    def runTest(self):
-        run_test_server.authorize_with("admin")
+class WebsocketTest(run_test_server.TestCaseWithServers):
+    MAIN_SERVER = {}
+
+    def setUp(self):
+        self.ws = None
+
+    def tearDown(self):
+        if self.ws:
+            self.ws.close()
+        super(WebsocketTest, self).tearDown()
+
+    def _test_subscribe(self, poll_fallback, expect_type):
+        run_test_server.authorize_with('active')
         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)
+            events.put, poll_fallback=poll_fallback)
+        self.assertIsInstance(self.ws, expect_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()
-
+    def test_subscribe_websocket(self):
+        self._test_subscribe(
+            poll_fallback=False, expect_type=arvados.events.EventClient)
 
-class WebsocketTest(EventTestBase, run_test_server.TestCaseWithServers):
-    MAIN_SERVER = {'websockets': True}
-    WS_TYPE = arvados.events.EventClient
-
-
-class PollClientTest(EventTestBase, run_test_server.TestCaseWithServers):
-    MAIN_SERVER = {}
-    WS_TYPE = arvados.events.PollClient
+    @mock.patch('arvados.events.EventClient.__init__')
+    def test_subscribe_poll(self, event_client_constr):
+        event_client_constr.side_effect = Exception('All is well')
+        self._test_subscribe(
+            poll_fallback=1, expect_type=arvados.events.PollClient)