Skip to content

Commit 55e2bf4

Browse files
committed
Stop residual instances after an app test
If a test fails or reaches --test-timeout, some non-default tarantool instances may be left running and so if a next test starts an instance with the same name, it may fail with the 'The daemon is already running' error. This change follows the approach of the previous commit ('Wait until residual servers will be stopped'). See a test case in PR #244 (app-tap/test-timeout.test.lua). Part of #65 Part of #157
1 parent cd3005a commit 55e2bf4

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

lib/app_server.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,10 @@ def execute(self, server):
7070
except TarantoolStartError:
7171
# A non-default server failed to start.
7272
raise TestExecutionError
73+
finally:
74+
# Stop any servers created by the test, except the
75+
# default one.
76+
ts.stop_nondefault()
7377
if retval['returncode'] != 0:
7478
raise TestExecutionError
7579

0 commit comments

Comments
 (0)