Skip to content

Updates required for tarantool/tarantool#9105 #424

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Updates required for tarantool/tarantool#9105 #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bebdb58
Bump luatest to 1.0.0-5-gxxx (WIP tarantool/luatest#355)
CuriousGeorgiy Feb 22, 2024
bd5d71f
Disable verbose serialization of box.error in diff tests
CuriousGeorgiy Feb 22, 2024
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
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
url = https://github.com/tarantool/checks.git
[submodule "lib/luatest"]
path = lib/luatest
url = https://github.com/tarantool/luatest.git
url = https://github.com/curiousgeorgiy/luatest.git
2 changes: 1 addition & 1 deletion lib/luatest
Open in desktop
Submodule luatest updated 10 files
+8 −3 CHANGELOG.md
+1 −1 luatest/VERSION.lua
+15 −4 luatest/assertions.lua
+5 −0 luatest/init.lua
+28 −5 luatest/output_beautifier.lua
+15 −9 luatest/pp.lua
+62 −1 luatest/runner.lua
+21 −2 luatest/server.lua
+42 −4 luatest/server_instance.lua
+11 −0 luatest/utils.lua
7 changes: 7 additions & 0 deletions lib/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,13 @@ class Server(object):
assert(box.error.injection.set('ERRINJ_AUTO_UPGRADE', true) == 'ok', \
'no such errinj')"

# Since the verbose box.error representation contains the diagnostic trace,
# it is unsuitable for diff tests, and we disable it from the CLI.
DISABLE_BOX_ERROR_SERIALIZE_VERBOSE = \
"_, tweaks = pcall(require, 'internal.tweaks') " \
"if tweaks ~= nil and tweaks.box_error_serialize_verbose ~= nil then " \
"tweaks.box_error_serialize_verbose = false end"

@property
def vardir(self):
if not hasattr(self, '_vardir'):
Expand Down
7 changes: 4 additions & 3 deletions lib/tarantool_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -839,11 +839,12 @@ def copy_files(self):
shutil.copy(self.snapshot_path, snapshot_dest)

def prepare_args(self, args=[]):
cli_args = [self.ctl_path, 'start',
cli_args = [self.binary, '-e', self.DISABLE_BOX_ERROR_SERIALIZE_VERBOSE,
self.ctl_path, 'start',
os.path.basename(self.script)] + args
if self.disable_schema_upgrade:
cli_args = [self.binary, '-e',
self.DISABLE_AUTO_UPGRADE] + cli_args
cli_args = cli_args[0] + ['-e', self.DISABLE_AUTO_UPGRADE] + \
cli_args[1:]

return cli_args

Expand Down