Revert "ctdb-tests: Improve test portability/quality"

Fix missing Reviewed-by: tag.

This reverts commit d2f8cd835da39784f2d99231f9a1067ae56ede7a.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

1 files changed, 25 insertions, 23 deletions

diff --git a/ctdb/tests/INTEGRATION/database/basics.001.attach.sh b/ctdb/tests/INTEGRATION/database/basics.001.attach.sh
index 1fbffc58436..e5c6b81ba65 100755
--- a/ctdb/tests/INTEGRATION/database/basics.001.attach.sh
+++ b/ctdb/tests/INTEGRATION/database/basics.001.attach.sh
@@ -8,11 +8,14 @@ set -e
 
 ctdb_test_init
 
-select_test_node
+make_temp_db_filename ()
+{
+    dd if=/dev/urandom count=1 bs=512 2>/dev/null |
+    md5sum |
+    awk '{printf "%s.tdb\n", $1}'
+}
 
-# test_node set by select_test_node() above
-# shellcheck disable=SC2154
-ctdb_onnode -v "$test_node" getdbmap
+try_command_on_node -v 0 "$CTDB getdbmap"
 
 dbid='dbid:0x[[:xdigit:]]+'
 name='name:[^[:space:]]+'
@@ -21,28 +24,27 @@ opts='( (PERSISTENT|STICKY|READONLY|REPLICATED|UNHEALTHY))*'
 line="${dbid} ${name} ${path}${opts}"
 dbmap_pattern="^(Number of databases:[[:digit:]]+|${line})\$"
 
-# outfile set by ctdb_onnode() above
-# shellcheck disable=SC2154
 num_db_init=$(sed -n -e '1s/.*://p' "$outfile")
 
 sanity_check_output $(($num_db_init + 1)) "$dbmap_pattern"
 
 for i in $(seq 1 5) ; do
-	f="attach_test_${i}.tdb"
-	echo "Creating test database: $f"
-	ctdb_onnode "$test_node" "attach ${f}"
-
-	ctdb_onnode "$test_node" getdbmap
-	sanity_check_output $((num_db_init + 1)) "$dbmap_pattern"
-	num=$(sed -n -e '1s/^.*://p' "$outfile")
-	if [ "$num" = $((num_db_init + i)) ] ; then
-		echo "OK: correct number of additional databases"
-	else
-		ctdb_test_fail "BAD: no additional database"
-	fi
-	if awk '{print $2}' "$outfile" | grep -Fqx "name:$f" ; then
-		echo "OK: getdbmap knows about \"$f\""
-	else
-		ctdb_test_fail "BAD: getdbmap does not know about \"$f\""
-	fi
+    f=$(make_temp_db_filename)
+    echo "Creating test database: $f"
+    try_command_on_node 0 $CTDB attach "$f"
+    try_command_on_node 0 $CTDB getdbmap
+    sanity_check_output $(($num_db_init + 1)) "$dbmap_pattern"
+    num=$(sed -n -e '1s/^.*://p' "$outfile")
+    if [ $num = $(($num_db_init + $i)) ] ; then
+	echo "OK: correct number of additional databases"
+    else
+	echo "BAD: no additional database"
+	exit 1
+    fi
+    if awk '{print $2}' "$outfile" | grep -Fqx "name:$f" ; then
+	echo "OK: getdbmap knows about \"$f\""
+    else
+	echo "BAD: getdbmap does not know about \"$f\""
+	exit 1
+    fi
 done