trinity-1686a/garage
2
0
Fork 0
forked from Deuxfleurs/garage
Code Issues Pull requests 1 Projects Releases Wiki Activity

Fix integration test

Browse source
This commit is contained in:
Alex 2022-11-08 15:13:37 +01:00
parent d75b37b018
commit fc2729cd81
Signed by untrusted user: lx
GPG key ID: 0E496D15096376BE
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
script/dev-cluster.sh
View file

@ -11,7 +11,7 @@ PATH="${GARAGE_DEBUG}:${GARAGE_RELEASE}:${NIX_RELEASE}:$PATH"
FANCYCOLORS=("41m" "42m" "44m" "45m" "100m" "104m") FANCYCOLORS=("41m" "42m" "44m" "45m" "100m" "104m")
export RUST_BACKTRACE=1 export RUST_BACKTRACE=1
export RUST_LOG=garage=info,garage_api=debug,netapp=trace export RUST_LOG=garage=info,garage_api=debug
MAIN_LABEL="\e[${FANCYCOLORS[0]}[main]\e[49m" MAIN_LABEL="\e[${FANCYCOLORS[0]}[main]\e[49m"
WHICH_GARAGE=$(which garage || exit 1) WHICH_GARAGE=$(which garage || exit 1)

3
script/dev-configure.sh
View file

@ -25,7 +25,8 @@ garage -c /tmp/config.1.toml status \
| grep 'NO ROLE' \ | grep 'NO ROLE' \
| grep -Po '^[0-9a-f]+' \ | grep -Po '^[0-9a-f]+' \
| while read id; do | while read id; do
garage -c /tmp/config.1.toml layout assign $id -z dc1 -c 1 garage -c /tmp/config.1.toml layout assign $id -z dc1 -c 1G
done done
garage -c /tmp/config.1.toml layout config -r 1
garage -c /tmp/config.1.toml layout apply --version 1 garage -c /tmp/config.1.toml layout apply --version 1

2
src/garage/tests/common/garage.rs
View file

@ -126,7 +126,7 @@ api_bind_addr = "127.0.0.1:{admin_port}"
self.command() self.command()
.args(["layout", "assign"]) .args(["layout", "assign"])
.arg(node_short_id) .arg(node_short_id)
.args(["-c", "1", "-z", "unzonned"]) .args(["-c", "1G", "-z", "unzonned"])
.quiet() .quiet()
.expect_success_status("Could not assign garage node layout"); .expect_success_status("Could not assign garage node layout");
self.command() self.command()