1 files changed, 18 insertions, 27 deletions
diff --git a/ctdb/tests/CLUSTER/complex/42_failover_ssh_hostname.sh b/ctdb/tests/CLUSTER/complex/42_failover_ssh_hostname.sh
index 82490e769b8..233819b011d 100755
--- a/ctdb/tests/CLUSTER/complex/42_failover_ssh_hostname.sh
+++ b/ctdb/tests/CLUSTER/complex/42_failover_ssh_hostname.sh
@@ -1,47 +1,38 @@
 #!/bin/bash
 
-test_info()
-{
-    cat <<EOF
-Verify that it is possible to SSH to a public address after disabling a node.
+# Verify that it is possible to SSH to a public address after disabling a node.
 
-We SSH to a public IP and check the hostname, disable the node hosting
-it and then SSH again to confirm that the hostname has changed.
+# We SSH to a public IP and check the hostname, disable the node hosting
+# it and then SSH again to confirm that the hostname has changed.
 
-Prerequisites:
+# Prerequisites:
 
-* An active CTDB cluster with at least 2 nodes with public addresses.
+# * An active CTDB cluster with at least 2 nodes with public addresses.
 
-* Test must be run on a real or virtual cluster rather than against
-  local daemons.
+# * Test must be run on a real or virtual cluster rather than against
+#   local daemons.
 
-* Test must not be run from a cluster node.
+# * Test must not be run from a cluster node.
 
-Steps:
+# Steps:
 
-1. Verify that the cluster is healthy.
-2. Select a public address and its corresponding node.
-3. SSH to the selected public address and run hostname.
-4. Disable the selected node.
-5. SSH to the selected public address again and run hostname.
+# 1. Verify that the cluster is healthy.
+# 2. Select a public address and its corresponding node.
+# 3. SSH to the selected public address and run hostname.
+# 4. Disable the selected node.
+# 5. SSH to the selected public address again and run hostname.
 
-Expected results:
+# Expected results:
 
-* When a node is disabled the public address fails over and it is
-  still possible to SSH to the node.  The hostname should change.
-EOF
-}
+# * When a node is disabled the public address fails over and it is
+#   still possible to SSH to the node.  The hostname should change.
 
-. "${TEST_SCRIPTS_DIR}/integration.bash"
+. "${TEST_SCRIPTS_DIR}/cluster.bash"
 
 set -e
 
 ctdb_test_init
 
-ctdb_test_check_real_cluster
-
-cluster_is_healthy
-
 select_test_node_and_ips
 
 echo "Removing ${test_ip} from the local neighbor table..."