Commit 4a4642ad authored by Jelte Jansen's avatar Jelte Jansen
Browse files

[master] Update systests

Merge of #2380 missed a couple of cases, and added a few more sleeps to help with background loading checks.
parent ff7903d2
...@@ -22,5 +22,5 @@ SUBTEST_TOP=${TEST_TOP}/bindctl ...@@ -22,5 +22,5 @@ SUBTEST_TOP=${TEST_TOP}/bindctl
cp ${SUBTEST_TOP}/nsx1/b10-config.db.template ${SUBTEST_TOP}/nsx1/b10-config.db cp ${SUBTEST_TOP}/nsx1/b10-config.db.template ${SUBTEST_TOP}/nsx1/b10-config.db
rm -f ${SUBTEST_TOP}/*/zone.sqlite3 rm -f ${SUBTEST_TOP}/*/zone.sqlite3
${B10_LOADZONE} -c '{"database_file": "'${SUBTEST_TOP}/nsx1/zone.sqlite3'"}' \ ${B10_LOADZONE} -i 1 -c "{\"database_file\": \"${SUBTEST_TOP}/nsx1/zone.sqlite3\"}" \
. ${SUBTEST_TOP}//nsx1/root.db . ${SUBTEST_TOP}//nsx1/root.db
...@@ -85,6 +85,7 @@ config commit ...@@ -85,6 +85,7 @@ config commit
quit quit
' | $RUN_BINDCTL \ ' | $RUN_BINDCTL \
--csv-file-dir=$BINDCTL_CSV_DIR 2>&1 > /dev/null || status=1 --csv-file-dir=$BINDCTL_CSV_DIR 2>&1 > /dev/null || status=1
sleep 2
$DIG +norec @10.53.0.1 -p 53210 ns.example.com. A >dig.out.$n || status=1 $DIG +norec @10.53.0.1 -p 53210 ns.example.com. A >dig.out.$n || status=1
# perform a simple check on the output (digcomp would be too much for this) # perform a simple check on the output (digcomp would be too much for this)
grep 192.0.2.1 dig.out.$n > /dev/null || status=1 grep 192.0.2.1 dig.out.$n > /dev/null || status=1
...@@ -118,6 +119,7 @@ config commit ...@@ -118,6 +119,7 @@ config commit
quit quit
" | $RUN_BINDCTL \ " | $RUN_BINDCTL \
--csv-file-dir=$BINDCTL_CSV_DIR > bindctl.out.$n || status=1 --csv-file-dir=$BINDCTL_CSV_DIR > bindctl.out.$n || status=1
sleep 2
$DIG +norec @10.53.0.1 -p 53210 ns.example.com. A >dig.out.$n || status=1 $DIG +norec @10.53.0.1 -p 53210 ns.example.com. A >dig.out.$n || status=1
grep 192.0.2.2 dig.out.$n > /dev/null || status=1 grep 192.0.2.2 dig.out.$n > /dev/null || status=1
if [ $status != 0 ]; then echo "I:failed"; fi if [ $status != 0 ]; then echo "I:failed"; fi
...@@ -148,6 +150,7 @@ quit ...@@ -148,6 +150,7 @@ quit
' | $RUN_BINDCTL \ ' | $RUN_BINDCTL \
--csv-file-dir=$BINDCTL_CSV_DIR 2>&1 > /dev/null || status=1 --csv-file-dir=$BINDCTL_CSV_DIR 2>&1 > /dev/null || status=1
done done
sleep 2
$DIG +norec @10.53.0.1 -p 53210 ns.example.com. A >dig.out.$n || status=1 $DIG +norec @10.53.0.1 -p 53210 ns.example.com. A >dig.out.$n || status=1
grep 192.0.2.2 dig.out.$n > /dev/null || status=1 grep 192.0.2.2 dig.out.$n > /dev/null || status=1
if [ $status != 0 ]; then echo "I:failed"; fi if [ $status != 0 ]; then echo "I:failed"; fi
...@@ -183,6 +186,7 @@ quit ...@@ -183,6 +186,7 @@ quit
' | $RUN_BINDCTL \ ' | $RUN_BINDCTL \
--csv-file-dir=$BINDCTL_CSV_DIR 2>&1 > /dev/null || status=1 --csv-file-dir=$BINDCTL_CSV_DIR 2>&1 > /dev/null || status=1
done done
sleep 2
$DIG +norec @10.53.0.1 -p 53210 ns.example.com. A >dig.out.$n || status=1 $DIG +norec @10.53.0.1 -p 53210 ns.example.com. A >dig.out.$n || status=1
grep 192.0.2.2 dig.out.$n > /dev/null || status=1 grep 192.0.2.2 dig.out.$n > /dev/null || status=1
if [ $status != 0 ]; then echo "I:failed"; fi if [ $status != 0 ]; then echo "I:failed"; fi
......
...@@ -18,8 +18,8 @@ SYSTEMTESTTOP=.. ...@@ -18,8 +18,8 @@ SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh . $SYSTEMTESTTOP/conf.sh
rm -f */zone.sqlite3 rm -f */zone.sqlite3
${B10_LOADZONE} -o . -d @builddir@/nsx1/zone.sqlite3 @builddir@/nsx1/root.db ${B10_LOADZONE} -i 1 -c '{"database_file": "@builddir@/nsx1/zone.sqlite3"}' . @builddir@/nsx1/root.db
${B10_LOADZONE} -o root-servers.nil -d @builddir@/nsx1/zone.sqlite3 \ ${B10_LOADZONE} -i 1 -c '{"database_file": "@builddir@/nsx1/zone.sqlite3"}' root-servers.nil \
@builddir@/nsx1/root-servers.nil.db @builddir@/nsx1/root-servers.nil.db
${B10_LOADZONE} -o com -d @builddir@/nsx1/zone.sqlite3 @builddir@/nsx1/com.db ${B10_LOADZONE} -i 1 -c '{"database_file": "@builddir@/nsx1/zone.sqlite3"}' com @builddir@/nsx1/com.db
${B10_LOADZONE} -o net -d @builddir@/nsx1/zone.sqlite3 @builddir@/nsx1/net.db ${B10_LOADZONE} -i 1 -c '{"database_file": "@builddir@/nsx1/zone.sqlite3"}' net @builddir@/nsx1/net.db
...@@ -27,4 +27,4 @@ cp -f $IXFR_TOP/db.example.n4 ns1/db.example ...@@ -27,4 +27,4 @@ cp -f $IXFR_TOP/db.example.n4 ns1/db.example
# Set up the IXFR client - load the same version of the zone. # Set up the IXFR client - load the same version of the zone.
cp -f $IXFR_TOP/b10-config.db nsx2/b10-config.db cp -f $IXFR_TOP/b10-config.db nsx2/b10-config.db
${B10_LOADZONE} -o . -d $IXFR_TOP/zone.sqlite3 $IXFR_TOP/db.example.n4 ${B10_LOADZONE} -c "{\"database_file\": \"$IXFR_TOP/zone.sqlite3\"}" example. $IXFR_TOP/db.example.n4
...@@ -26,4 +26,4 @@ cp -f $IXFR_TOP/db.example.n6 ns1/db.example ...@@ -26,4 +26,4 @@ cp -f $IXFR_TOP/db.example.n6 ns1/db.example
# Set up the IXFR client - load an earlier version of the zone # Set up the IXFR client - load an earlier version of the zone
cp -f $IXFR_TOP/b10-config.db nsx2/b10-config.db cp -f $IXFR_TOP/b10-config.db nsx2/b10-config.db
${B10_LOADZONE} -o . -d $IXFR_TOP/zone.sqlite3 $IXFR_TOP/db.example.n6 ${B10_LOADZONE} -c "{\"database_file\": \"$IXFR_TOP/zone.sqlite3\"}" example. $IXFR_TOP/db.example.n6
...@@ -26,4 +26,4 @@ cp -f $IXFR_TOP/db.example.n0 ns1/db.example ...@@ -26,4 +26,4 @@ cp -f $IXFR_TOP/db.example.n0 ns1/db.example
# Set up the IXFR client - load a previous version of the zone. # Set up the IXFR client - load a previous version of the zone.
cp -f $IXFR_TOP/b10-config.db nsx2/b10-config.db cp -f $IXFR_TOP/b10-config.db nsx2/b10-config.db
${B10_LOADZONE} -o . -d $IXFR_TOP/zone.sqlite3 $IXFR_TOP/db.example.n2 ${B10_LOADZONE} -c "{\"database_file\": \"$IXFR_TOP/zone.sqlite3\"}" example. $IXFR_TOP/db.example.n2
...@@ -27,4 +27,4 @@ cp -f $IXFR_TOP/db.example.n2.refresh ns1/db.example ...@@ -27,4 +27,4 @@ cp -f $IXFR_TOP/db.example.n2.refresh ns1/db.example
# Set up the IXFR client - load a previous version of the zone with a short # Set up the IXFR client - load a previous version of the zone with a short
# refresh time. # refresh time.
cp -f $IXFR_TOP/b10-config.db nsx2/b10-config.db cp -f $IXFR_TOP/b10-config.db nsx2/b10-config.db
${B10_LOADZONE} -o . -d $IXFR_TOP/zone.sqlite3 $IXFR_TOP/db.example.n2.refresh ${B10_LOADZONE} -c "{\"database_file\": \"$IXFR_TOP/zone.sqlite3\"}" example. $IXFR_TOP/db.example.n2.refresh
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment