From: Martin Schwenke <martin@meltin.net>
Date: Wed, 21 Mar 2018 05:21:06 +0000 (+1100)
Subject: ctdb-tests: Update argument handling of ctdb stub functions
X-Git-Tag: talloc-2.1.13~196
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=713804beecbd05ec0e5c0ef823130fe1fd59061c;p=thirdparty%2Fsamba.git

ctdb-tests: Update argument handling of ctdb stub functions

All functions are now called after shifting away the command name.

There is less churn that expected because some functions don't use any
arguments.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/ctdb/tests/eventscripts/stubs/ctdb b/ctdb/tests/eventscripts/stubs/ctdb
index 7f466c0980a..1090543eb36 100755
--- a/ctdb/tests/eventscripts/stubs/ctdb
+++ b/ctdb/tests/eventscripts/stubs/ctdb
@@ -301,7 +301,6 @@ ctdb_nodestatus ()
 
 ctdb_setvar ()
 {
-    shift
     _var="$1"
 
     for _i in $FAKE_CTDB_TUNABLES_OK ; do
@@ -346,25 +345,25 @@ _t_del ()
 
 ctdb_pstore ()
 {
-    _t_setup "$2"
-    _t_put "$3" "$4"
+    _t_setup "$1"
+    _t_put "$2" "$3"
 }
 
 ctdb_pdelete ()
 {
-    _t_setup "$2"
-    _t_del "$3"
+    _t_setup "$1"
+    _t_del "$2"
 }
 
 ctdb_pfetch ()
 {
-    _t_setup "$2"
-    _t_get "$3" >"$4" 2>/dev/null
+    _t_setup "$1"
+    _t_get "$2" >"$3" 2>/dev/null
 }
 
 ctdb_ptrans ()
 {
-    _t_setup "$2"
+    _t_setup "$1"
 
     while IFS="" read _line ; do
 	_k=$(echo "$_line" | sed -n -e 's@^"\([^"]*\)" "[^"]*"$@\1@p')
@@ -380,7 +379,7 @@ ctdb_ptrans ()
 
 ctdb_catdb ()
 {
-    _t_setup "$2"
+    _t_setup "$1"
 
     # This will break on keys with spaces but we don't have any of
     # those yet.
@@ -474,22 +473,22 @@ case "$1" in
     gettickles) shift ; ctdb_gettickles "$@" ;;
     addtickle) shift ; ctdb_addtickle "$@" ;;
     deltickle) shift ; ctdb_deltickle "$@" ;;
-    pstore)  ctdb_pstore  "$@" ;;
-    pdelete) ctdb_pdelete "$@" ;;
-    pfetch)  ctdb_pfetch  "$@" ;;
-    ptrans)  ctdb_ptrans  "$@" ;;
-    catdb)   ctdb_catdb   "$@" ;;
+    pstore) shift; ctdb_pstore  "$@" ;;
+    pdelete) shift ; ctdb_pdelete "$@" ;;
+    pfetch) shift ; ctdb_pfetch  "$@" ;;
+    ptrans) shift ; ctdb_ptrans  "$@" ;;
+    catdb) shift ; ctdb_catdb   "$@" ;;
     ifaces) shift ; ctdb_ifaces "$@" ;;
     setifacelink) shift ; ctdb_setifacelink "$@" ;;
     checktcpport) shift ; ctdb_checktcpport "$@" ;;
     gratarp) shift ; ctdb_gratarp "$@" ;;
-    ip)            ctdb_ip "$@" ;;
-    pnn)	   ctdb_pnn ;;
-    enable)        ctdb_enable "$@";;
-    disable)       ctdb_disable "$@";;
+    ip) shift ; ctdb_ip "$@" ;;
+    pnn) shift ; ctdb_pnn ;;
+    enable) shift ; ctdb_enable "$@";;
+    disable) shift ; ctdb_disable "$@";;
     moveip) shift ; ctdb_moveip "$@";;
-    shutdown)      ctdb_shutdown "$@";;
-    setvar)	   ctdb_setvar "$@" ;;
-    nodestatus)	   ctdb_nodestatus "$@" ;;
+    shutdown) shift ; ctdb_shutdown "$@";;
+    setvar) shift ; ctdb_setvar "$@" ;;
+    nodestatus) shift ; ctdb_nodestatus "$@" ;;
     *) not_implemented "$1" ;;
 esac