Skip to content

Commit 5852a25

Browse files
test: fix unix socket test resource warnings
hasattr check actually has no effect for unittest runtime-added fields, so both server and connection for unix socket test weren't closed after run. Part of #250
1 parent 56577aa commit 5852a25

File tree

1 file changed

+13
-10
lines changed

1 file changed

+13
-10
lines changed

Diff for: test/suites/test_dml.py

+13-10
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,13 @@ def setUpClass(self):
3838
self.adm("fiber = require('fiber')")
3939
self.adm("uuid = require('uuid')")
4040

41+
if not sys.platform.startswith("win"):
42+
self.sock_srv = TarantoolServer(create_unix_socket=True)
43+
self.sock_srv.script = 'test/suites/box.lua'
44+
self.sock_srv.start()
45+
else:
46+
self.sock_srv = None
47+
4148
def setUp(self):
4249
# prevent a remote tarantool from clean our session
4350
if self.srv.is_started():
@@ -302,12 +309,11 @@ def test_13_unix_socket_connect(self):
302309
if sys.platform.startswith("win"):
303310
self.skipTest("Skip UNIX socket tests on Windows since it uses remote server")
304311

305-
self.sock_srv = TarantoolServer(create_unix_socket=True)
306-
self.sock_srv.script = 'test/suites/box.lua'
307-
self.sock_srv.start()
308-
309-
self.sock_con = tarantool.connect(self.sock_srv.host, self.sock_srv.args['primary'])
310-
self.assertEqual(self.sock_con.ping(notime=True), "Success")
312+
sock_con = tarantool.connect(self.sock_srv.host, self.sock_srv.args['primary'])
313+
try:
314+
self.assertEqual(sock_con.ping(notime=True), "Success")
315+
finally:
316+
sock_con.close()
311317

312318
def test_14_idempotent_close(self):
313319
con = tarantool.connect(self.srv.host, self.srv.args['primary'])
@@ -322,9 +328,6 @@ def tearDownClass(self):
322328
self.srv.stop()
323329
self.srv.clean()
324330

325-
if hasattr(self, 'sock_srv'):
331+
if self.sock_srv is not None:
326332
self.sock_srv.stop()
327333
self.sock_srv.clean()
328-
329-
if hasattr(self, 'sock_con'):
330-
self.sock_con.close()

0 commit comments

Comments
 (0)