summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2012-03-06 00:46:55 +0100
committerJelmer Vernooij <jelmer@samba.org>2012-03-06 02:26:29 +0100
commitf033c221f8f459759aee259be8f52a79fd7e8f3f (patch)
tree7d8ede52d05b2b97c02907b2100eb2756b1b19b9
parentaaffd996abd9404bb942570f49ca01598ebe0fc3 (diff)
downloadsamba-f033c221f8f459759aee259be8f52a79fd7e8f3f.tar.gz
samba-f033c221f8f459759aee259be8f52a79fd7e8f3f.tar.bz2
samba-f033c221f8f459759aee259be8f52a79fd7e8f3f.zip
policy/python: Move python binding tests to standard location.
Autobuild-User: Jelmer Vernooij <jelmer@samba.org> Autobuild-Date: Tue Mar 6 02:26:29 CET 2012 on sn-devel-104
-rw-r--r--source4/scripting/python/samba/tests/policy.py (renamed from source4/lib/policy/tests/python/bindings.py)0
-rwxr-xr-xsource4/selftest/tests.py2
2 files changed, 1 insertions, 1 deletions
diff --git a/source4/lib/policy/tests/python/bindings.py b/source4/scripting/python/samba/tests/policy.py
index 08b67e70c9..08b67e70c9 100644
--- a/source4/lib/policy/tests/python/bindings.py
+++ b/source4/scripting/python/samba/tests/policy.py
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index e308070671..d49f253e84 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -466,7 +466,7 @@ planpythontestsuite("none", "samba.tests.ntacls")
plantestsuite("samba4.deletetest.python(dc)", "dc", ['PYTHONPATH="$PYTHONPATH:%s/lib/subunit/python:%s/lib/testtools"' % (srcdir(), srcdir()),
python, os.path.join(samba4srcdir, "dsdb/tests/python/deletetest.py"),
'$SERVER', '-U"$USERNAME%$PASSWORD"', '--workgroup=$DOMAIN'])
-planpythontestsuite("none", "bindings", extra_path=["%s/lib/policy/tests/python" % samba4srcdir], name="samba4.policy.python")
+planpythontestsuite("none", "samba.tests.policy")
plantestsuite("samba4.blackbox.samba3dump", "none", [python, os.path.join(samba4srcdir, "scripting/bin/samba3dump"), os.path.join(samba4srcdir, "../testdata/samba3")], allow_empty_output=True)
plantestsuite("samba4.blackbox.upgrade", "none", ["PYTHON=%s" % python, os.path.join(samba4srcdir, "setup/tests/blackbox_s3upgrade.sh"), '$PREFIX/provision'])
plantestsuite("samba4.blackbox.provision.py", "none", ["PYTHON=%s" % python, os.path.join(samba4srcdir, "setup/tests/blackbox_provision.sh"), '$PREFIX/provision'])