sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

Revert "ctdb-tests: Separate custom cluster startup from test initialisation"

Browse Source 
Fix missing Reviewed-by: tag.

This reverts commit e9df17b500.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2020-07-22 14:43:04 +10:00 committed by Martin Schwenke
parent 941a2d0a3b
commit e11526ad54
4 changed files with 14 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ctdb/tests/INTEGRATION/failover/pubips.013.failover_noop.sh
View File

@ -11,10 +11,10 @@ set -e
ctdb_test_skip_on_cluster
ctdb_test_init -n
echo "Starting CTDB with failover disabled..."
ctdb_nodes_start_custom -F
ctdb_test_init -F
cluster_is_healthy
echo "Getting IP allocation..."
try_command_on_node -v any "$CTDB ip all | tail -n +2"
@ -30,7 +30,9 @@ echo "GOOD: All IP addresses are unassigned"
echo "----------------------------------------"
echo "Starting CTDB with an empty public addresses configuration..."
ctdb_nodes_start_custom -P /dev/null
ctdb_test_init -P /dev/null
cluster_is_healthy
echo "Trying explicit ipreallocate..."
try_command_on_node any $CTDB ipreallocate

6
ctdb/tests/INTEGRATION/simple/cluster.012.reclock_command.sh
View File

@ -12,9 +12,9 @@ set -e
ctdb_test_skip_on_cluster
ctdb_test_init -n
echo "Starting CTDB with recovery lock command configured..."
ctdb_nodes_start_custom -R
ctdb_test_init -R
cluster_is_healthy
echo "Good, that seems to work!"

4
ctdb/tests/INTEGRATION/simple/eventscripts.001.zero_scripts.sh
View File

@ -9,8 +9,8 @@ set -e
ctdb_test_skip_on_cluster
ctdb_test_init -n
ctdb_test_init --no-event-scripts
ctdb_nodes_start_custom --no-event-scripts
cluster_is_healthy
echo "Good, that seems to work!"

24
ctdb/tests/scripts/integration.bash
View File

@ -88,37 +88,19 @@ ctdb_test_cleanup_pid_clear ()
ctdb_test_cleanup_pid=""
}
# -n option means do not configure/start cluster
ctdb_test_init ()
{
trap "ctdb_test_exit" 0
ctdb_nodes_stop >/dev/null 2>&1 || true
if [ "$1" != "-n" ] ; then
echo "Configuring cluster..."
setup_ctdb || ctdb_test_error "Cluster configuration failed"
echo "Starting cluster..."
ctdb_init || ctdb_test_error "Cluster startup failed"
fi
echo "*** SETUP COMPLETE AT $(date '+%F %T'), RUNNING TEST..."
}
ctdb_nodes_start_custom ()
{
if ctdb_test_on_cluster ; then
ctdb_test_error "ctdb_nodes_start_custom() on real cluster"
fi
ctdb_nodes_stop >/dev/null 2>&1 || true
echo "Configuring cluster..."
setup_ctdb "$@" || ctdb_test_error "Cluster configuration failed"
echo "Starting cluster..."
ctdb_init || ctdb_test_fail "Cluster startup failed"
ctdb_init || ctdb_test_error "Cluster startup failed"
echo "*** SETUP COMPLETE AT $(date '+%F %T'), RUNNING TEST..."
}
ctdb_test_skip_on_cluster ()