diff options
| -rwxr-xr-x | test/scripts/light-system-test-prepare-redistribute-frontend.sh | 4 | ||||
| -rw-r--r-- | test/scripts/testutils.sh | 2 | ||||
| -rwxr-xr-x | tools/getconfig.sh | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/test/scripts/light-system-test-prepare-redistribute-frontend.sh b/test/scripts/light-system-test-prepare-redistribute-frontend.sh index 7141ba5..c7b6f82 100755 --- a/test/scripts/light-system-test-prepare-redistribute-frontend.sh +++ b/test/scripts/light-system-test-prepare-redistribute-frontend.sh @@ -11,4 +11,6 @@ mv machine/machine-1 machine/machine-1-down mkdir -p machine/machine-1/db touch machine/machine-1/db/index touch machine/machine-1/db/newentries -cp machine/machine-1-down/{catlfish-test-local-1.cfg,catlfish-test.cfg,catlfish-test.cfg.sig} machine/machine-1/ +cp machine/machine-1-down/catlfish-test-local-1.cfg machine/machine-1/ +cp machine/machine-1-down/catlfish-test.cfg machine/machine-1/ +cp machine/machine-1-down/catlfish-test.cfg.sig machine/machine-1/ diff --git a/test/scripts/testutils.sh b/test/scripts/testutils.sh index d3a9672..657607b 100644 --- a/test/scripts/testutils.sh +++ b/test/scripts/testutils.sh @@ -43,7 +43,7 @@ do_merge() { ${top_srcdir}/tools/mergestatus.py --config machine/merge/catlfish-test.cfg --localconfig machine/merge/catlfish-test-local-merge.cfg n=$((n-1)) treesize=$(get_treesize) - [ "${treesize}" == "${expected_treesize}" ] && return + [ "${treesize}" = "${expected_treesize}" ] && return sleep 1 done } diff --git a/tools/getconfig.sh b/tools/getconfig.sh index f73cf1b..aaab7ee 100755 --- a/tools/getconfig.sh +++ b/tools/getconfig.sh @@ -15,7 +15,7 @@ plopcontrolport=$(cat ${plopcontrolfile}) configversion=$(echo "configversion" | nc 127.0.0.1 ${plopcontrolport}) echo "version before reload: $configversion" getconfigresult=$(${BINDIR}/getconfig.py --localconfig ${localconfig} --dest ${globalconfig}) -if [ "$getconfigresult" == "newconfig" ]; then +if [ "$getconfigresult" = "newconfig" ]; then ${BINDIR}/compileconfig.py --localconfig ${localconfig} --config ${globalconfig} reloadresult=$(echo "reload" | nc 127.0.0.1 ${plopcontrolport}) echo $reloadresult |