From: Björn Baumbach <bb@sernet.de>
Date: Mon, 25 Nov 2019 19:53:35 +0000 (+0100)
Subject: samba-tool tests: remove duplicate definitions of test functions
X-Git-Tag: ldb-2.1.0~499
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c35b3ef2e1e79559c4293a413f5d422908546919;p=thirdparty%2Fsamba.git

samba-tool tests: remove duplicate definitions of test functions

Signed-off-by: Björn Baumbach <bb@sernet.de>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/python/samba/tests/samba_tool/computer_edit.sh b/python/samba/tests/samba_tool/computer_edit.sh
index fb6c668f2a3..974c9deaeb5 100755
--- a/python/samba/tests/samba_tool/computer_edit.sh
+++ b/python/samba/tests/samba_tool/computer_edit.sh
@@ -124,12 +124,6 @@ EOF
 		-H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
 }
 
-get_attribute_base64_control() {
-	$PYTHON ${STpath}/source4/scripting/bin/samba-tool computer show \
-		testmachine1 --attributes=displayName \
-		-H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
-}
-
 # Test edit computer - change attributes with LDB_FLAG_FORCE_NO_BASE64_LDIF
 change_attribute_force_no_base64() {
 	# create editor.sh
diff --git a/python/samba/tests/samba_tool/contact_edit.sh b/python/samba/tests/samba_tool/contact_edit.sh
index ca38900062a..cc3445e57e7 100755
--- a/python/samba/tests/samba_tool/contact_edit.sh
+++ b/python/samba/tests/samba_tool/contact_edit.sh
@@ -109,12 +109,6 @@ EOF
 		-H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
 }
 
-get_attribute_base64_control() {
-	$PYTHON ${STpath}/source4/scripting/bin/samba-tool contact show \
-		testcontact1 --attributes=displayName \
-		-H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
-}
-
 # Test edit contact - change attributes with LDB_FLAG_FORCE_NO_BASE64_LDIF
 change_attribute_force_no_base64() {
 	# create editor.sh
diff --git a/python/samba/tests/samba_tool/group_edit.sh b/python/samba/tests/samba_tool/group_edit.sh
index 90f5252d926..fe807c7029e 100755
--- a/python/samba/tests/samba_tool/group_edit.sh
+++ b/python/samba/tests/samba_tool/group_edit.sh
@@ -155,12 +155,6 @@ EOF
 		-H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
 }
 
-get_attribute_base64_control() {
-	$PYTHON ${STpath}/source4/scripting/bin/samba-tool group show \
-		testgroup1 --attributes=displayName \
-		-H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
-}
-
 # Test edit group - change attributes with LDB_FLAG_FORCE_NO_BASE64_LDIF
 change_attribute_force_no_base64() {
 	# create editor.sh
diff --git a/python/samba/tests/samba_tool/user_edit.sh b/python/samba/tests/samba_tool/user_edit.sh
index 03fbd61ff5d..17e11db5fd2 100755
--- a/python/samba/tests/samba_tool/user_edit.sh
+++ b/python/samba/tests/samba_tool/user_edit.sh
@@ -123,12 +123,6 @@ EOF
 		-H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
 }
 
-get_attribute_base64_control() {
-	$PYTHON ${STpath}/source4/scripting/bin/samba-tool user show \
-		sambatool1 --attributes=displayName \
-		-H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
-}
-
 # Test edit user - change attributes with LDB_FLAG_FORCE_NO_BASE64_LDIF
 change_attribute_force_no_base64() {
 	# create editor.sh