summaryrefslogtreecommitdiff
path: root/ctdb/tests/UNIT
diff options
context:
space:
mode:
Diffstat (limited to 'ctdb/tests/UNIT')
-rwxr-xr-xctdb/tests/UNIT/eventscripts/91.lvs.ipreallocated.012.sh2
-rwxr-xr-xctdb/tests/UNIT/eventscripts/91.lvs.ipreallocated.013.sh4
-rwxr-xr-xctdb/tests/UNIT/eventscripts/91.lvs.ipreallocated.014.sh4
-rw-r--r--ctdb/tests/UNIT/eventscripts/scripts/91.lvs.sh10
-rwxr-xr-xctdb/tests/UNIT/eventscripts/stubs/ctdb_lvs10
-rwxr-xr-xctdb/tests/UNIT/tool/ctdb.lvs.001.sh2
-rwxr-xr-xctdb/tests/UNIT/tool/ctdb.lvs.002.sh2
-rwxr-xr-xctdb/tests/UNIT/tool/ctdb.lvs.003.sh2
-rwxr-xr-xctdb/tests/UNIT/tool/ctdb.lvs.004.sh2
-rwxr-xr-xctdb/tests/UNIT/tool/ctdb.lvs.005.sh2
-rwxr-xr-xctdb/tests/UNIT/tool/ctdb.lvs.006.sh2
-rwxr-xr-xctdb/tests/UNIT/tool/ctdb.lvs.007.sh2
-rwxr-xr-xctdb/tests/UNIT/tool/ctdb.lvs.008.sh2
13 files changed, 23 insertions, 23 deletions
diff --git a/ctdb/tests/UNIT/eventscripts/91.lvs.ipreallocated.012.sh b/ctdb/tests/UNIT/eventscripts/91.lvs.ipreallocated.012.sh
index 970a4aa9ccf..15328efba97 100755
--- a/ctdb/tests/UNIT/eventscripts/91.lvs.ipreallocated.012.sh
+++ b/ctdb/tests/UNIT/eventscripts/91.lvs.ipreallocated.012.sh
@@ -2,7 +2,7 @@
. "${TEST_SCRIPTS_DIR}/unit.sh"
-define_test "nodes in config, no master (e.g. all inactive)"
+define_test "nodes in config, no leader (e.g. all inactive)"
setup "10.1.1.201" "eth0" <<EOF
192.168.1.1
diff --git a/ctdb/tests/UNIT/eventscripts/91.lvs.ipreallocated.013.sh b/ctdb/tests/UNIT/eventscripts/91.lvs.ipreallocated.013.sh
index 0720036b448..918b18db352 100755
--- a/ctdb/tests/UNIT/eventscripts/91.lvs.ipreallocated.013.sh
+++ b/ctdb/tests/UNIT/eventscripts/91.lvs.ipreallocated.013.sh
@@ -2,11 +2,11 @@
. "${TEST_SCRIPTS_DIR}/unit.sh"
-define_test "nodes in config, other node is master"
+define_test "nodes in config, other node is leader"
setup "10.1.1.201" "eth0" <<EOF
192.168.1.1
-192.168.1.2 master
+192.168.1.2 leader
192.168.1.3
EOF
diff --git a/ctdb/tests/UNIT/eventscripts/91.lvs.ipreallocated.014.sh b/ctdb/tests/UNIT/eventscripts/91.lvs.ipreallocated.014.sh
index 19788d7bc8c..8af31d7f618 100755
--- a/ctdb/tests/UNIT/eventscripts/91.lvs.ipreallocated.014.sh
+++ b/ctdb/tests/UNIT/eventscripts/91.lvs.ipreallocated.014.sh
@@ -2,10 +2,10 @@
. "${TEST_SCRIPTS_DIR}/unit.sh"
-define_test "nodes in config, this is master"
+define_test "nodes in config, this is leader"
setup "10.1.1.201" "eth0" <<EOF
-192.168.1.1 master
+192.168.1.1 leader
192.168.1.2
192.168.1.3
EOF
diff --git a/ctdb/tests/UNIT/eventscripts/scripts/91.lvs.sh b/ctdb/tests/UNIT/eventscripts/scripts/91.lvs.sh
index a29c4d353fd..a8104eb0b3d 100644
--- a/ctdb/tests/UNIT/eventscripts/scripts/91.lvs.sh
+++ b/ctdb/tests/UNIT/eventscripts/scripts/91.lvs.sh
@@ -17,18 +17,18 @@ CTDB_LVS_PUBLIC_IP="$_ip"
CTDB_LVS_PUBLIC_IFACE="$_iface"
EOF
- export FAKE_CTDB_LVS_MASTER=""
+ export FAKE_CTDB_LVS_LEADER=""
# Read from stdin
_pnn=0
while read _ip _opts ; do
case "$_opts" in
- master)
- FAKE_CTDB_LVS_MASTER="$_pnn"
+ leader)
+ FAKE_CTDB_LVS_LEADER="$_pnn"
echo "$_ip"
;;
- slave-only)
- printf "%s\tslave-only\n" "$_ip"
+ follower-only)
+ printf "%s\tfollower-only\n" "$_ip"
;;
*)
echo "$_ip"
diff --git a/ctdb/tests/UNIT/eventscripts/stubs/ctdb_lvs b/ctdb/tests/UNIT/eventscripts/stubs/ctdb_lvs
index 5dfb24901e3..85e005c0b36 100755
--- a/ctdb/tests/UNIT/eventscripts/stubs/ctdb_lvs
+++ b/ctdb/tests/UNIT/eventscripts/stubs/ctdb_lvs
@@ -13,7 +13,7 @@ not_implemented_exit_code=1
usage ()
{
cat >&2 <<EOF
-Usage: $prog { master | list }
+Usage: $prog { leader | list }
EOF
exit 1
}
@@ -24,10 +24,10 @@ not_implemented ()
exit $not_implemented_exit_code
}
-ctdb_lvs_master ()
+ctdb_lvs_leader ()
{
- if [ -n "$FAKE_CTDB_LVS_MASTER" ] ; then
- echo "$FAKE_CTDB_LVS_MASTER"
+ if [ -n "$FAKE_CTDB_LVS_LEADER" ] ; then
+ echo "$FAKE_CTDB_LVS_LEADER"
return 0
else
return 255
@@ -46,7 +46,7 @@ ctdb_lvs_list ()
######################################################################
case "$1" in
- master) ctdb_lvs_master "$@" ;;
+ leader) ctdb_lvs_leader "$@" ;;
list) ctdb_lvs_list "$@" ;;
*) not_implemented "$1" ;;
esac
diff --git a/ctdb/tests/UNIT/tool/ctdb.lvs.001.sh b/ctdb/tests/UNIT/tool/ctdb.lvs.001.sh
index 411072c5da4..70c726c7b3c 100755
--- a/ctdb/tests/UNIT/tool/ctdb.lvs.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.lvs.001.sh
@@ -19,7 +19,7 @@ EOF
required_result 255 <<EOF
EOF
-simple_test master
+simple_test leader
#####
diff --git a/ctdb/tests/UNIT/tool/ctdb.lvs.002.sh b/ctdb/tests/UNIT/tool/ctdb.lvs.002.sh
index 5344b166a4e..edde656478b 100755
--- a/ctdb/tests/UNIT/tool/ctdb.lvs.002.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.lvs.002.sh
@@ -23,7 +23,7 @@ required_result 0 <<EOF
0
EOF
-simple_test master
+simple_test leader
#####
diff --git a/ctdb/tests/UNIT/tool/ctdb.lvs.003.sh b/ctdb/tests/UNIT/tool/ctdb.lvs.003.sh
index c3d1f7221f1..0045ae47281 100755
--- a/ctdb/tests/UNIT/tool/ctdb.lvs.003.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.lvs.003.sh
@@ -22,7 +22,7 @@ required_result 0 <<EOF
0
EOF
-simple_test master
+simple_test leader
#####
diff --git a/ctdb/tests/UNIT/tool/ctdb.lvs.004.sh b/ctdb/tests/UNIT/tool/ctdb.lvs.004.sh
index ea1d1887fe6..255966d2588 100755
--- a/ctdb/tests/UNIT/tool/ctdb.lvs.004.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.lvs.004.sh
@@ -23,7 +23,7 @@ required_result 0 <<EOF
1
EOF
-simple_test master
+simple_test leader
#####
diff --git a/ctdb/tests/UNIT/tool/ctdb.lvs.005.sh b/ctdb/tests/UNIT/tool/ctdb.lvs.005.sh
index 592224863ea..73fcd80b5be 100755
--- a/ctdb/tests/UNIT/tool/ctdb.lvs.005.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.lvs.005.sh
@@ -23,7 +23,7 @@ required_result 0 <<EOF
0
EOF
-simple_test master
+simple_test leader
#####
diff --git a/ctdb/tests/UNIT/tool/ctdb.lvs.006.sh b/ctdb/tests/UNIT/tool/ctdb.lvs.006.sh
index 2f9859a6be8..55b43103b0c 100755
--- a/ctdb/tests/UNIT/tool/ctdb.lvs.006.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.lvs.006.sh
@@ -23,7 +23,7 @@ required_result 0 <<EOF
2
EOF
-simple_test master
+simple_test leader
#####
diff --git a/ctdb/tests/UNIT/tool/ctdb.lvs.007.sh b/ctdb/tests/UNIT/tool/ctdb.lvs.007.sh
index dd47b9e69ca..3dd1104623a 100755
--- a/ctdb/tests/UNIT/tool/ctdb.lvs.007.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.lvs.007.sh
@@ -22,7 +22,7 @@ EOF
required_result 255 <<EOF
EOF
-simple_test master
+simple_test leader
#####
diff --git a/ctdb/tests/UNIT/tool/ctdb.lvs.008.sh b/ctdb/tests/UNIT/tool/ctdb.lvs.008.sh
index 6cdd702c57c..1997f4c2909 100755
--- a/ctdb/tests/UNIT/tool/ctdb.lvs.008.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.lvs.008.sh
@@ -41,7 +41,7 @@ Failed to detect PNN of the current node.
Is this node part of CTDB cluster?
EOF
-simple_test master
+simple_test leader
#####
View Lorry Controller Status