[SCM] Samba Shared Repository - branch master updated

[Amitay Isaacs]

The branch, master has been updated
       via  a23d805 ctdb-tests: Fix a typo
       via  693ca7b ctdb-tests: Simplify a test
      from  110e72c ctdb-scripts: Drop CTDB_RC_LOCAL testing hook

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit a23d80547545f1d367ef446d6d7173999ca4e97c
Author: Martin Schwenke <martin at meltin.net>
Date:   Mon Apr 30 12:07:48 2018 +1000

    ctdb-tests: Fix a typo
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Amitay Isaacs <amitay at gmail.com>
    
    Autobuild-User(master): Amitay Isaacs <amitay at samba.org>
    Autobuild-Date(master): Mon Apr 30 14:26:43 CEST 2018 on sn-devel-144

commit 693ca7b99e6b2bcce5a3a9c375a2c7e83a053894
Author: Martin Schwenke <martin at meltin.net>
Date:   Tue Feb 27 06:40:59 2018 +1100

    ctdb-tests: Simplify a test
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Amitay Isaacs <amitay at gmail.com>

-----------------------------------------------------------------------

Summary of changes:
 ctdb/tests/simple/03_ctdb_getvar.sh    |  2 +-
 ctdb/tests/simple/20_delip_iface_gc.sh | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/tests/simple/03_ctdb_getvar.sh b/ctdb/tests/simple/03_ctdb_getvar.sh
index a58aa3b..cae3dd1 100755
--- a/ctdb/tests/simple/03_ctdb_getvar.sh
+++ b/ctdb/tests/simple/03_ctdb_getvar.sh
@@ -36,7 +36,7 @@ cluster_is_healthy
 
 try_command_on_node -v 0 "$CTDB listvars"
 
-echo "Veryifying all variable values using \"ctdb getvar\"..."
+echo "Verifying all variable values using \"ctdb getvar\"..."
 
 echo "$out" |
 while read var x val ; do
diff --git a/ctdb/tests/simple/20_delip_iface_gc.sh b/ctdb/tests/simple/20_delip_iface_gc.sh
index 8ad001f..e73eed2 100755
--- a/ctdb/tests/simple/20_delip_iface_gc.sh
+++ b/ctdb/tests/simple/20_delip_iface_gc.sh
@@ -18,14 +18,12 @@ cluster_is_healthy
 # Reset configuration
 ctdb_restart_when_done
 
-echo "Getting public IPs information..."
-try_command_on_node -v any "$CTDB ip -v all -X | tail -n +2"
-ip_info="$out"
-
-# Select the first node and find out its interfaces
-test_node=$(awk -F'|' 'NR == 1 { print $3}' <<<"$ip_info")
-ifaces=$(awk -F'|' -v tn=$test_node '$3 == tn { print $6 }' <<<"$ip_info" | sed 's@, @ @g' | xargs -n 1 | sort -u)
-echo "Selected test node ${test_node} with interfaces: ${ifaces}"
+select_test_node_and_ips
+
+# Find interfaces on test node
+try_command_on_node $test_node "$CTDB ifaces -X"
+ifaces=$(awk -F'|' 'NR > 1 { print $2 }' <<<"$out")
+echo "Node ${test_node} has interfaces: ${ifaces}"
 
 # Delete all IPs on each interface...  deleting IPs from one interface
 # can cause other interfaces to disappear, so we need to be careful...


-- 
Samba Shared Repository