sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

ctdb-tests: Use consistent NAT gateway nodes file

Browse Source 
Using a different file each time causes the event script to believe
that the configuration has changed even though only the node states
have changed.  Change this to stop the tests from doing something
unexpected.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2018-02-12 11:34:57 +11:00 committed by Martin Schwenke
parent 1c2361a5f7
commit bb03532cdd
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ctdb/tests/eventscripts/11.natgw.015.sh
View File

@ -33,7 +33,7 @@ setup_ctdb_natgw <<EOF
192.168.1.24 192.168.1.24
EOF EOF
ok "NAT gateway configuration has changed" ok_null
simple_test_event "ipreallocated" simple_test_event "ipreallocated"
ok "default via ${FAKE_CTDB_NATGW_MASTER} dev ethXXX metric 10 " ok "default via ${FAKE_CTDB_NATGW_MASTER} dev ethXXX metric 10 "
@ -51,7 +51,7 @@ setup_ctdb_natgw <<EOF
192.168.1.24 192.168.1.24
EOF EOF
ok "NAT gateway configuration has changed" ok_null
simple_test_event "ipreallocated" simple_test_event "ipreallocated"
ok "default via ${CTDB_NATGW_DEFAULT_GATEWAY} dev ethXXX metric 10 " ok "default via ${CTDB_NATGW_DEFAULT_GATEWAY} dev ethXXX metric 10 "
@ -59,4 +59,3 @@ simple_test_command ip route show
ok_natgw_master_ip_addr_show ok_natgw_master_ip_addr_show
simple_test_command ip addr show "$CTDB_NATGW_PUBLIC_IFACE" simple_test_command ip addr show "$CTDB_NATGW_PUBLIC_IFACE"

4
ctdb/tests/eventscripts/11.natgw.025.sh
View File

@ -35,7 +35,7 @@ setup_ctdb_natgw <<EOF
192.168.1.24 192.168.1.24
EOF EOF
ok "NAT gateway configuration has changed" ok_null
simple_test_event "ipreallocated" simple_test_event "ipreallocated"
ok_natgw_slave_static_routes ok_natgw_slave_static_routes
@ -53,7 +53,7 @@ setup_ctdb_natgw <<EOF
192.168.1.24 192.168.1.24
EOF EOF
ok "NAT gateway configuration has changed" ok_null
simple_test_event "ipreallocated" simple_test_event "ipreallocated"
ok_natgw_master_static_routes ok_natgw_master_static_routes

4
ctdb/tests/eventscripts/scripts/local.sh
View File

@ -728,9 +728,7 @@ setup_ctdb_natgw ()
natgw_config_dir="${TEST_VAR_DIR}/natgw_config" natgw_config_dir="${TEST_VAR_DIR}/natgw_config"
mkdir -p "$natgw_config_dir" mkdir -p "$natgw_config_dir"
# These will accumulate, 1 per test... but will be cleaned up at export CTDB_NATGW_NODES="${natgw_config_dir}/natgw_nodes"
# the end.
export CTDB_NATGW_NODES=$(mktemp --tmpdir="$natgw_config_dir")
# Read from stdin # Read from stdin
while read _ip _opts ; do while read _ip _opts ; do