From bebdb583f4ebb4be7fe2c6d5807be28a92b4bcab Mon Sep 17 00:00:00 2001 From: Georgiy Lebedev Date: Thu, 22 Feb 2024 15:41:13 +0300 Subject: [PATCH 1/2] Bump luatest to 1.0.0-5-gxxx (WIP tarantool/luatest#355) New version includes the following commits. - Change conversion of `box.error` to string in error message assertions [1] [1] tarantool/luatest@xxx (WIP tarantool/luatest#355) --- .gitmodules | 2 +- lib/luatest | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index e58ad745..58faf81f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/lib/luatest b/lib/luatest index f31fe34b..00099726 160000 --- a/lib/luatest +++ b/lib/luatest @@ -1 +1 @@ -Subproject commit f31fe34bd3030f858b0f042d5484b73249777867 +Subproject commit 000997260070b9916d2c698d254741135d3b30d1 From bd5d71fe992e301d9aa4d2d838e792b63eefe80c Mon Sep 17 00:00:00 2001 From: Georgiy Lebedev Date: Thu, 22 Feb 2024 15:19:39 +0300 Subject: [PATCH 2/2] Disable verbose serialization of box.error in diff tests In scope of tarantool/tarantool#9105, we are going to increase the verbosity of `box.error` serialization. Since the verbose error representation contains the diagnostic trace, it is unsuitable for diff tests, so let's disable it from the CLI. Needed for tarantool/tarantool#9105 --- lib/server.py | 7 +++++++ lib/tarantool_server.py | 7 ++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/server.py b/lib/server.py index 045543cc..080037bf 100644 --- a/lib/server.py +++ b/lib/server.py @@ -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'): diff --git a/lib/tarantool_server.py b/lib/tarantool_server.py index a0b213bc..9a4b1292 100644 --- a/lib/tarantool_server.py +++ b/lib/tarantool_server.py @@ -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