Merge branch 'master' of git.curoverse.com:arvados into 3408-production-datamanager

[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..032ac51f0d445a5b03e751cf569f5c835307c367 100644 (file)
--- a/sdk/python/tests/test_websockets.py
+++ b/sdk/python/tests/test_websockets.py
@@ -18,6 +18,7 @@ class EventTestBase(object):
             self.fail()
 
     def runTest(self):
+        self.ws = None
         self.state = 1
         self.subscribed = threading.Event()
         self.done = threading.Event()
@@ -25,8 +26,7 @@ class EventTestBase(object):
         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.assertIsInstance(self.ws, self.WS_TYPE)
         self.subscribed.wait(10)
         self.h = api.humans().create(body={}).execute()
         self.done.wait(10)
@@ -37,8 +37,9 @@ class WebsocketTest(run_test_server.TestCaseWithServers, EventTestBase):
     WS_TYPE = arvados.events.EventClient
 
     def tearDown(self):
-        self.ws.close()
-        super(run_test_server.TestCaseWithServers, self).tearDown()
+        if self.ws:
+            self.ws.close()
+        super(WebsocketTest, self).tearDown()
 
 
 class PollClientTest(run_test_server.TestCaseWithServers, EventTestBase):
@@ -46,5 +47,6 @@ class PollClientTest(run_test_server.TestCaseWithServers, EventTestBase):
     WS_TYPE = arvados.events.PollClient
 
     def tearDown(self):
-        self.ws.close()
-        super(run_test_server.TestCaseWithServers, self).tearDown()
+        if self.ws:
+            self.ws.close()
+        super(PollClientTest, self).tearDown()