At some point the directory name changed to testbeds
Without reflecting this in the tests we do not actually shut down correctly during cleanup
Peter Rabbitson committed
Dec 14, 2019 at 15:27 UTC
4200bf453be4ade2a527108399ae2f13dc7ac903
2 files changed
+6
-6
test/sharness/t0121-bootstrap-iptb.sh
+5
-5
@@ -38,11 +38,11 @@ betterwait() {
38
}
39
40
test_expect_success "bring down iptb nodes" '
41
- PID0=$(cat "$IPTB_ROOT/benches/default/0/daemon.pid") &&
42
- PID1=$(cat "$IPTB_ROOT/benches/default/1/daemon.pid") &&
43
- PID2=$(cat "$IPTB_ROOT/benches/default/2/daemon.pid") &&
44
- PID3=$(cat "$IPTB_ROOT/benches/default/3/daemon.pid") &&
45
- PID4=$(cat "$IPTB_ROOT/benches/default/4/daemon.pid") &&
41
+ PID0=$(cat "$IPTB_ROOT/testbeds/default/0/daemon.pid") &&
42
+ PID1=$(cat "$IPTB_ROOT/testbeds/default/1/daemon.pid") &&
43
+ PID2=$(cat "$IPTB_ROOT/testbeds/default/2/daemon.pid") &&
44
+ PID3=$(cat "$IPTB_ROOT/testbeds/default/3/daemon.pid") &&
45
+ PID4=$(cat "$IPTB_ROOT/testbeds/default/4/daemon.pid") &&
46
iptb stop && # TODO: add --wait flag to iptb stop
47
betterwait $PID0
48
betterwait $PID1
test/sharness/t0130-multinode.sh
+1
-1
@@ -80,7 +80,7 @@ run_advanced_test() {
80
81
test_expect_success "shut down nodes" '
82
iptb stop && iptb_wait_stop ||
83
- test_fsh tail -n +1 .iptb/benches/default/*/daemon.std*
83
+ test_fsh tail -n +1 .iptb/testbeds/default/*/daemon.std*
84
'
85
}
86