Skip to content

Commit b3412e8

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 b3412e8

File tree

1 file changed

+10
-12
lines changed

1 file changed

+10
-12
lines changed

Diff for: test/suites/test_dml.py

+10-12
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ def setUpClass(self):
3737
self.adm("json = require('json')")
3838
self.adm("fiber = require('fiber')")
3939
self.adm("uuid = require('uuid')")
40+
self.sock_srv = TarantoolServer(create_unix_socket=True)
41+
self.sock_srv.script = 'test/suites/box.lua'
42+
self.sock_srv.start()
4043

4144
def setUp(self):
4245
# prevent a remote tarantool from clean our session
@@ -302,12 +305,11 @@ def test_13_unix_socket_connect(self):
302305
if sys.platform.startswith("win"):
303306
self.skipTest("Skip UNIX socket tests on Windows since it uses remote server")
304307

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")
308+
sock_con = tarantool.connect(self.sock_srv.host, self.sock_srv.args['primary'])
309+
try:
310+
self.assertEqual(sock_con.ping(notime=True), "Success")
311+
finally:
312+
sock_con.close()
311313

312314
def test_14_idempotent_close(self):
313315
con = tarantool.connect(self.srv.host, self.srv.args['primary'])
@@ -322,9 +324,5 @@ def tearDownClass(self):
322324
self.srv.stop()
323325
self.srv.clean()
324326

325-
if hasattr(self, 'sock_srv'):
326-
self.sock_srv.stop()
327-
self.sock_srv.clean()
328-
329-
if hasattr(self, 'sock_con'):
330-
self.sock_con.close()
327+
self.sock_srv.stop()
328+
self.sock_srv.clean()

0 commit comments

Comments
 (0)