tests: No need to run onnode in parallel for single node

Signed-off-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/tests/simple/70_recoverpdbbyseqnum.sh b/tests/simple/70_recoverpdbbyseqnum.sh
index dbd099a1a6c0432a11f8c3559afe5687c4da50b7..6d79859db2ee64b6e1353b8fe676c2ab42525c46 100755 (executable)
--- a/tests/simple/70_recoverpdbbyseqnum.sh
+++ b/tests/simple/70_recoverpdbbyseqnum.sh
@@ -87,7 +87,7 @@ echo force a recovery
 try_command_on_node 0 $CTDB_TEST_WRAPPER ctdb recover
 
 # check that we now have both records on node 0
-num_records=$(try_command_on_node -v -pq 0 $CTDB_TEST_WRAPPER ctdb cattdb persistent_test.tdb | grep key | egrep "ABC|DEF" | wc -l)
+num_records=$(try_command_on_node -v 0 $CTDB_TEST_WRAPPER ctdb cattdb persistent_test.tdb | grep key | egrep "ABC|DEF" | wc -l)
 [ $num_records != "2" ] && {
     echo "BAD: we did not end up with the expected two records after the recovery"
     exit 1
@@ -131,7 +131,7 @@ echo force a recovery
 try_command_on_node 0 $CTDB_TEST_WRAPPER ctdb recover
 
 # check that we now have both records on node 0
-num_records=$(try_command_on_node -v -pq 0 $CTDB_TEST_WRAPPER ctdb cattdb persistent_test.tdb | grep key | egrep "ABC|DEF" | wc -l)
+num_records=$(try_command_on_node -v 0 $CTDB_TEST_WRAPPER ctdb cattdb persistent_test.tdb | grep key | egrep "ABC|DEF" | wc -l)
 [ $num_records != "2" ] && {
     echo "BAD: we did not end up with the expected two records after the recovery"
     exit 1
@@ -172,7 +172,7 @@ echo force a recovery
 try_command_on_node 0 $CTDB_TEST_WRAPPER ctdb recover
 
 # check that we now have both records on node 0
-num_records=$(try_command_on_node -v -pq 0 $CTDB_TEST_WRAPPER ctdb cattdb persistent_test.tdb | grep key | egrep "ABC|DEF" | wc -l)
+num_records=$(try_command_on_node -v 0 $CTDB_TEST_WRAPPER ctdb cattdb persistent_test.tdb | grep key | egrep "ABC|DEF" | wc -l)
 [ $num_records != "2" ] && {
     echo "BAD: we did not end up with the expected two records after the recovery"
     exit 1
@@ -217,7 +217,7 @@ echo force a recovery
 try_command_on_node 0 $CTDB_TEST_WRAPPER ctdb recover
 
 # check that we now have both records on node 0
-num_records=$(try_command_on_node -v -pq 0 $CTDB_TEST_WRAPPER ctdb cattdb persistent_test.tdb | grep key | egrep "ABC|DEF" | wc -l)
+num_records=$(try_command_on_node -v 0 $CTDB_TEST_WRAPPER ctdb cattdb persistent_test.tdb | grep key | egrep "ABC|DEF" | wc -l)
 [ $num_records != "1" ] && {
     echo "BAD: we did not end up with the expected single record after the recovery"
     exit 1

diff --git a/tests/simple/71_ctdb_wipedb.sh b/tests/simple/71_ctdb_wipedb.sh
index b352890607728f86442380bb3e736fac009a361c..4bdc856fe483a779a3fb313ccfbc6985c69ffd48 100755 (executable)
--- a/tests/simple/71_ctdb_wipedb.sh
+++ b/tests/simple/71_ctdb_wipedb.sh
@@ -59,7 +59,7 @@ echo force a recovery
 try_command_on_node 0 $CTDB_TEST_WRAPPER ctdb recover
 
 # check that the database is wiped
-num_records=$(try_command_on_node -v -pq 1 $CTDB_TEST_WRAPPER ctdb cattdb persistent_test.tdb | grep key | wc -l)
+num_records=$(try_command_on_node -v 1 $CTDB_TEST_WRAPPER ctdb cattdb persistent_test.tdb | grep key | wc -l)
 [ $num_records != "0" ] && {
     echo "BAD: we did not end up with an empty database"
     exit 1

diff --git a/tests/simple/72_update_record_persistent.sh b/tests/simple/72_update_record_persistent.sh
index b4347ab563b17d0c1eb2cb5cf879a88ec8eeef6d..5cd1bfe63eae3ea1d9ea0295fcc1fbf9abf3c1ba 100755 (executable)
--- a/tests/simple/72_update_record_persistent.sh
+++ b/tests/simple/72_update_record_persistent.sh
@@ -51,7 +51,7 @@ echo force a recovery
 try_command_on_node 0 $CTDB_TEST_WRAPPER ctdb recover
 
 # check that the database is wiped
-num_records=$(try_command_on_node -v -pq 1 $CTDB_TEST_WRAPPER ctdb cattdb $TDB | grep key | wc -l)
+num_records=$(try_command_on_node -v 1 $CTDB_TEST_WRAPPER ctdb cattdb $TDB | grep key | wc -l)
 [ $num_records != "0" ] && {
     echo "BAD: we did not end up with an empty database"
     exit 1