From 004e6f4053e3683ed8b03d1880c4a53ded33d4b5 Mon Sep 17 00:00:00 2001 From: better0fdead Date: Thu, 3 Nov 2022 18:29:09 +0300 Subject: [PATCH] cartridge: update to master Updated fork of cartridge-cli to master. Updated go.sum/mod and test due to new behaviour of cartridge. Part of #124 --- cli/cartridge/third_party/cartridge-cli | 2 +- go.mod | 1 + go.sum | 3 ++- test/integration/cartridge/test_cartridge.py | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cli/cartridge/third_party/cartridge-cli b/cli/cartridge/third_party/cartridge-cli index af99c2094..1e2d4a0a5 160000 --- a/cli/cartridge/third_party/cartridge-cli +++ b/cli/cartridge/third_party/cartridge-cli @@ -1 +1 @@ -Subproject commit af99c209464b890b559ac82fcb2f03ed19fb9c93 +Subproject commit 1e2d4a0a56c7908357a80ae5a09e4c97b3f11386 diff --git a/go.mod b/go.mod index 895ca00b8..f84f6ec78 100644 --- a/go.mod +++ b/go.mod @@ -58,6 +58,7 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/pkg/term v1.2.0-beta.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/robfig/config v0.0.0-20141207224736-0f78529c8c7e // indirect github.com/shirou/gopsutil v3.21.2+incompatible // indirect github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect github.com/sirupsen/logrus v1.8.1 // indirect diff --git a/go.sum b/go.sum index 2d920d37e..98f908921 100644 --- a/go.sum +++ b/go.sum @@ -305,7 +305,6 @@ github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyG github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY= github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/distribution v2.8.0+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68= github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v20.10.7+incompatible h1:Z6O9Nhsjv+ayUEeI1IojKbYcsGdgYSNqxe1s2MYzUhQ= @@ -744,6 +743,8 @@ github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= +github.com/robfig/config v0.0.0-20141207224736-0f78529c8c7e h1:3/9k/etUfgykjM3Rx8X0echJzo7gNNeND/ubPkqYw1k= +github.com/robfig/config v0.0.0-20141207224736-0f78529c8c7e/go.mod h1:Zerq1qYbCKtIIU9QgPydffGlpYfZ8KI/si49wuTLY/Q= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.1.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= diff --git a/test/integration/cartridge/test_cartridge.py b/test/integration/cartridge/test_cartridge.py index 01cfe68ab..446f502ee 100644 --- a/test/integration/cartridge/test_cartridge.py +++ b/test/integration/cartridge/test_cartridge.py @@ -65,7 +65,7 @@ def test_cartridge_base_functionality(tt_cmd, tmpdir_with_cfg): "--run-dir", str(tmpdir) + "/run/" + cartridge_name] setup_rc, setup_out = run_command_and_get_output(setup_cmd, cwd=tmpdir) assert setup_rc == 0 - assert re.search(r'Vshard is bootstrapped successfully', setup_out) + assert re.search(r'Bootstrap vshard task completed successfully', setup_out) admin_cmd = [tt_cmd, "cartridge", "admin", "probe", "--name", cartridge_name,