From 7638fabe1eac4c90f1b816515bdeb1ecb1951c25 Mon Sep 17 00:00:00 2001 From: Hector Sanjuan Date: Fri, 25 May 2018 09:54:52 +0200 Subject: [PATCH] Fix sharness License: MIT Signed-off-by: Hector Sanjuan --- sharness/lib/test-lib.sh | 2 +- sharness/t0051-service-state-upgrade-from-old.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sharness/lib/test-lib.sh b/sharness/lib/test-lib.sh index 89d990756..d2dee5c65 100755 --- a/sharness/lib/test-lib.sh +++ b/sharness/lib/test-lib.sh @@ -72,7 +72,7 @@ test_cluster_init() { echo "cluster init FAIL: error on ipfs cluster init" exit 1 fi - rm -rf "test-config/ipfs-cluster-data" + rm -rf "test-config/raft" if [ -n "$custom_config_files" ]; then cp -f ${custom_config_files}/* "test-config" fi diff --git a/sharness/t0051-service-state-upgrade-from-old.sh b/sharness/t0051-service-state-upgrade-from-old.sh index 770f9d5ee..082a05e6b 100755 --- a/sharness/t0051-service-state-upgrade-from-old.sh +++ b/sharness/t0051-service-state-upgrade-from-old.sh @@ -18,7 +18,7 @@ test_expect_success IPFS,CLUSTER,V1STATE,JQ "cluster-service loads v1 state corr ipfs-cluster-ctl pin add "$cid2" && cluster_kill && sleep 15 && - SNAP_DIR=`find test-config/ipfs-cluster-data/snapshots/ -maxdepth 1 -mindepth 1 | head -n 1` && + SNAP_DIR=`find test-config/raft/snapshots/ -maxdepth 1 -mindepth 1 | head -n 1` && cp v1State "$SNAP_DIR/state.bin" && cat "$SNAP_DIR/meta.json" | jq --arg CRC "$V1_CRC" '"'"'.CRC = $CRC'"'"' > tmp.json && cp tmp.json "$SNAP_DIR/meta.json" &&