Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Catch non-default server start fail in app server #162

Merged
merged 1 commit into from
Apr 30, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions lib/app_server.py
Original file line number Diff line number Diff line change
@@ -9,7 +9,9 @@
from lib.colorer import color_log
from lib.preprocessor import TestState
from lib.server import Server
from lib.tarantool_server import Test, TarantoolServer
from lib.tarantool_server import Test
from lib.tarantool_server import TarantoolServer
from lib.tarantool_server import TarantoolStartError
from lib.utils import find_port
from lib.utils import format_process
from test import TestRunGreenlet, TestExecutionError
@@ -38,9 +40,13 @@ def execute(self, server):
tarantool = TestRunGreenlet(run_server, execs, server.vardir, server,
server.logfile, retval)
self.current_test_greenlet = tarantool
tarantool.start()

tarantool.join()
try:
tarantool.start()
tarantool.join()
except TarantoolStartError:
# A non-default server failed to start.
raise TestExecutionError
if retval['returncode'] != 0:
raise TestExecutionError