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 fb6c668f2a34dfcf4a9c8e8b2daeaa20282ff150..974c9deaeb581506b87d7f9eb659fe1099293a01 100755 (executable)
--- 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 ca38900062a4a82a2fc17e8f3f004629089c63d8..cc3445e57e75ac274c5c09d7c2f7658c6bd9a091 100755 (executable)
--- 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 90f5252d9264a3682d94916f0cb232834741fefe..fe807c7029e1ec387506f9d10c2eb7193dbfbb12 100755 (executable)
--- 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 03fbd61ff5dc7776095677cef5dea0c1c1604f0e..17e11db5fd2b496b6499a518fdb4437fb29bb0b2 100755 (executable)
--- 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