This is an automated email from the ASF dual-hosted git repository. jdanek pushed a commit to branch jd_tryout in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
commit 937070dc2336edcb4f81998413e1612615f5644f Author: Jiri Daněk <[email protected]> AuthorDate: Sun Jan 30 18:03:10 2022 +0100 DISPATCH-2323 Simplify test HTTPServer shutdown and fix its leaks --- tests/http1_tests.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/tests/http1_tests.py b/tests/http1_tests.py index 1430c64..e3d671e 100644 --- a/tests/http1_tests.py +++ b/tests/http1_tests.py @@ -661,15 +661,17 @@ class CommonHttp1Edge2EdgeTest: # ensure links recover once the server re-appears server = TestServer.new_server(self.http_server11_port, self.http_listener11_port, TESTS) - self.assertIsNotNone(server, TEST_SERVER_ERROR % self.http_server11_port) + try: + self.assertIsNotNone(server, TEST_SERVER_ERROR % self.http_server11_port) - self.EA2.wait_connectors() + self.EA2.wait_connectors() - client = ThreadedTestClient(TESTS, self.http_listener11_port) - client.wait() - self.assertIsNone(client.error) - self.assertEqual(1, client.count) - server.wait() + client = ThreadedTestClient(TESTS, self.http_listener11_port) + client.wait() + self.assertIsNone(client.error) + self.assertEqual(1, client.count) + finally: + server.wait() def test_05_large_streaming_msg(self): """ --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
