X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9af0808e182e297b9c957c93f629016e1517eba1..1578bb430ce005137f49233ef87fac34ebc51e2e:/sdk/python/tests/test_websockets.py

diff --git a/sdk/python/tests/test_websockets.py b/sdk/python/tests/test_websockets.py
index 61fb54df22..d879ebe1f8 100644
--- a/sdk/python/tests/test_websockets.py
+++ b/sdk/python/tests/test_websockets.py
@@ -3,37 +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")
-        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")
-
+class WebsocketTest(run_test_server.TestCaseWithServers):
+    MAIN_SERVER = {}
 
-class WebsocketTest(run_test_server.TestCaseWithServers, EventTestBase):
-    MAIN_SERVER = {'websockets': True}
-    WS_TYPE = arvados.events.EventClient
+    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=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")
 
-class PollClientTest(run_test_server.TestCaseWithServers, EventTestBase):
-    MAIN_SERVER = {}
-    WS_TYPE = arvados.events.PollClient
+    def test_subscribe_websocket(self):
+        self._test_subscribe(
+            poll_fallback=False, expect_type=arvados.events.EventClient)
 
-    def tearDown(self):
-        if self.ws:
-            self.ws.close()
-        super(PollClientTest, self).tearDown()
+    @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)