s4:selftest/test_samba_tool.sh - add a basic unit test for the new "domain info"...

Signed-off-by: Stefan Metzmacher <metze@samba.org>

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index f465396fe1d7fb8ae28b1fcf56b73aa4c2d954d6..b2779d3a3733aef93af789316334cbdca4cb0550 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -303,7 +303,7 @@ planpythontestsuite("dc", "samba.tests.dns")
 
 planpythontestsuite("none", "samba.tests.blackbox.ndrdump")
 planpythontestsuite("none", "samba.tests.source")
-plantestsuite("samba4.blackbox.samba_tool(dc:local)", "dc:local", [os.path.join(samba4srcdir, "utils/tests/test_samba_tool.sh"),  '$SERVER', "$USERNAME", "$PASSWORD", "$DOMAIN"])
+plantestsuite("samba4.blackbox.samba_tool(dc:local)", "dc:local", [os.path.join(samba4srcdir, "utils/tests/test_samba_tool.sh"), '$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD', '$DOMAIN'])
 plantestsuite("samba4.blackbox.pkinit(dc:local)", "dc:local", [os.path.join(bbdir, "test_pkinit.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$PREFIX', "aes256-cts-hmac-sha1-96", configuration])
 plantestsuite("samba4.blackbox.kinit(dc:local)", "dc:local", [os.path.join(bbdir, "test_kinit.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$PREFIX', "aes256-cts-hmac-sha1-96", configuration])
 plantestsuite("samba4.blackbox.kinit(fl2000dc:local)", "fl2000dc:local", [os.path.join(bbdir, "test_kinit.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$PREFIX', "arcfour-hmac-md5", configuration])

diff --git a/source4/utils/tests/test_samba_tool.sh b/source4/utils/tests/test_samba_tool.sh
index 1ae25bdf160f59d5fa2461bac6af681577ea6fbc..fb8e3e092ff1d63f2a782c680aaf5f98c1fbccdb 100755 (executable)
--- a/source4/utils/tests/test_samba_tool.sh
+++ b/source4/utils/tests/test_samba_tool.sh
@@ -2,10 +2,11 @@
 # Blackbox tests for samba-tool
 
 SERVER=$1
-USERNAME=$2
-PASSWORD=$3
-DOMAIN=$4
-shift 4
+SERVER_IP=$2
+USERNAME=$3
+PASSWORD=$4
+DOMAIN=$5
+shift 5
 
 failed=0
 
@@ -35,6 +36,8 @@ testit "Test login with --machine-pass and kerberos" $VALGRIND $smbclient -c 'ls
 
 testit "time" $VALGRIND $samba_tool time $SERVER $CONFIGURATION  -W "$DOMAIN" -U"$USERNAME%$PASSWORD" $@
 
-# FIXME: testit "domain level.show" $VALGRIND $samba_tool domain level show $CONFIGURATION
+testit "domain level.show" $VALGRIND $samba_tool domain level show
+
+testit "domain info" $VALGRIND $samba_tool domain info $SERVER_IP
 
 exit $failed