summaryrefslogtreecommitdiff
path: root/source4/selftest
diff options
context:
space:
mode:
authorKai Blin <kai@samba.org>2010-10-23 19:27:26 -0700
committerKai Blin <kai@samba.org>2010-10-28 07:25:16 +0000
commitb73a05e4e184238614d73c1519f2880cd946908d (patch)
tree5405be11f54e857eeb9b74ca46121ea0b2aea34e /source4/selftest
parent5634f55cc8d9eb0cca01f621939cee724271ecb0 (diff)
downloadsamba-b73a05e4e184238614d73c1519f2880cd946908d.tar.gz
samba-b73a05e4e184238614d73c1519f2880cd946908d.tar.bz2
samba-b73a05e4e184238614d73c1519f2880cd946908d.zip
s4 net: rename to samba-tool in order to not clash with s3 net
Autobuild-User: Kai Blin <kai@samba.org> Autobuild-Date: Thu Oct 28 07:25:16 UTC 2010 on sn-devel-104
Diffstat (limited to 'source4/selftest')
-rw-r--r--source4/selftest/skip2
-rwxr-xr-xsource4/selftest/tests.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/selftest/skip b/source4/selftest/skip
index e43fefebda..e03234b3ca 100644
--- a/source4/selftest/skip
+++ b/source4/selftest/skip
@@ -62,7 +62,7 @@ rpc.lsa.forest # Not provided by Samba 4
^samba4.ntvfs.cifs.raw.samba3.* # Samba3-specific test
samba4.ntvfs.cifs.raw.
^samba4.rpc..*samba3.* # Samba3-specific test
-^samba4.net.domopen.*$ # Hangs for some reason
+^samba4.samba-tool.domopen.*$ # Hangs for some reason
nss.test # Fails
raw.offline # Samba 4 doesn't have much offline support yet
rpc.autoidl # this one just generates a lot of noise, and is no longer useful
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 5877f4f02c..a252a87d08 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -355,7 +355,7 @@ planperltestsuite("selftest.samba4", os.path.normpath(os.path.join(samba4srcdir,
# work correctly.
planpythontestsuite("none", "samba.tests.blackbox.ndrdump")
-plantestsuite("samba4.blackbox.net(dc:local)", "dc:local", [os.path.join(samba4srcdir, "utils/tests/test_net.sh"), '$SERVER', "$USERNAME", "$PASSWORD", "$DOMAIN"])
+plantestsuite("samba4.blackbox.samba_tool(dc:local)", "dc:local", [os.path.join(samba4srcdir, "utils/tests/test_net.sh"), '$SERVER', "$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])