From 487dc40959c4a7a8838624c6e108236320e79c8d Mon Sep 17 00:00:00 2001 From: Brett Smith Date: Sun, 1 Feb 2015 11:22:42 -0500 Subject: [PATCH] 5037: Fix tearDown error handling in PySDK Websockets test. I accidentally broke this in 51f9e6cb. That version would crash if the test failed to assign self.ws. Refactor to be more robust in that case. No issue #. --- sdk/python/tests/test_websockets.py | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/sdk/python/tests/test_websockets.py b/sdk/python/tests/test_websockets.py index 61fb54df22..45dd28a157 100644 --- a/sdk/python/tests/test_websockets.py +++ b/sdk/python/tests/test_websockets.py @@ -18,22 +18,19 @@ class EventTestBase(object): 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() + -class WebsocketTest(run_test_server.TestCaseWithServers, EventTestBase): +class WebsocketTest(EventTestBase, run_test_server.TestCaseWithServers): MAIN_SERVER = {'websockets': True} WS_TYPE = arvados.events.EventClient - def tearDown(self): - if self.ws: - self.ws.close() - super(WebsocketTest, self).tearDown() - -class PollClientTest(run_test_server.TestCaseWithServers, EventTestBase): +class PollClientTest(EventTestBase, run_test_server.TestCaseWithServers): MAIN_SERVER = {} WS_TYPE = arvados.events.PollClient - - def tearDown(self): - if self.ws: - self.ws.close() - super(PollClientTest, self).tearDown() -- 2.30.2