diff options
| -rwxr-xr-x | selftest/selftest.pl | 4 | ||||
| -rw-r--r-- | source4/scripting/python/samba/tests/__init__.py | 41 | ||||
| -rw-r--r-- | source4/scripting/python/samba/tests/core.py | 65 | ||||
| -rwxr-xr-x | source4/selftest/tests.sh | 2 |
4 files changed, 68 insertions, 44 deletions
diff --git a/selftest/selftest.pl b/selftest/selftest.pl index 5457306c62..6c0aab9d6b 100755 --- a/selftest/selftest.pl +++ b/selftest/selftest.pl @@ -706,7 +706,7 @@ foreach my $testsuite (@available) { $match = $r; $restricted_used->{$r} = 1; } elsif (substr($r, 0, length($name)+1) eq "$name.") { - push(@{$individual_tests->{$name}}, substr($r, length($name)+1)); + push(@{$individual_tests->{$name}}, $r); $match = $r; $restricted_used->{$r} = 1; } @@ -938,7 +938,7 @@ $envvarstr if ($$_[3]) { my ($fh, $listid_file) = tempfile(UNLINK => 0); foreach my $test (@{$individual_tests->{$name}}) { - print $fh "$test\n"; + print $fh substr($test, length($name)+1) . "\n"; } $cmd =~ s/\$LOADLIST/--load-list=$listid_file/g; } elsif ($$_[4]) { diff --git a/source4/scripting/python/samba/tests/__init__.py b/source4/scripting/python/samba/tests/__init__.py index 9644bad4cf..f2c2fbff63 100644 --- a/source4/scripting/python/samba/tests/__init__.py +++ b/source4/scripting/python/samba/tests/__init__.py @@ -59,47 +59,6 @@ class TestCaseInTempDir(TestCase): os.rmdir(self.tempdir) -class SubstituteVarTestCase(TestCase): - - def test_empty(self): - self.assertEquals("", samba.substitute_var("", {})) - - def test_nothing(self): - self.assertEquals("foo bar", - samba.substitute_var("foo bar", {"bar": "bla"})) - - def test_replace(self): - self.assertEquals("foo bla", - samba.substitute_var("foo ${bar}", {"bar": "bla"})) - - def test_broken(self): - self.assertEquals("foo ${bdkjfhsdkfh sdkfh ", - samba.substitute_var("foo ${bdkjfhsdkfh sdkfh ", {"bar": "bla"})) - - def test_unknown_var(self): - self.assertEquals("foo ${bla} gsff", - samba.substitute_var("foo ${bla} gsff", {"bar": "bla"})) - - def test_check_all_substituted(self): - samba.check_all_substituted("nothing to see here") - self.assertRaises(Exception, samba.check_all_substituted, - "Not subsituted: ${FOOBAR}") - - -class LdbExtensionTests(TestCaseInTempDir): - - def test_searchone(self): - path = self.tempdir + "/searchone.ldb" - l = samba.Ldb(path) - try: - l.add({"dn": "foo=dc", "bar": "bla"}) - self.assertEquals("bla", - l.searchone(basedn=ldb.Dn(l, "foo=dc"), attribute="bar")) - finally: - del l - os.unlink(path) - - def env_loadparm(): lp = param.LoadParm() try: diff --git a/source4/scripting/python/samba/tests/core.py b/source4/scripting/python/samba/tests/core.py new file mode 100644 index 0000000000..1c3d7dbe44 --- /dev/null +++ b/source4/scripting/python/samba/tests/core.py @@ -0,0 +1,65 @@ +#!/usr/bin/env python + +# Unix SMB/CIFS implementation. +# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2007-2008 +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +"""Samba Python tests.""" + +import ldb +import os +import samba +from samba.tests import TestCase, TestCaseInTempDir + +class SubstituteVarTestCase(TestCase): + + def test_empty(self): + self.assertEquals("", samba.substitute_var("", {})) + + def test_nothing(self): + self.assertEquals("foo bar", + samba.substitute_var("foo bar", {"bar": "bla"})) + + def test_replace(self): + self.assertEquals("foo bla", + samba.substitute_var("foo ${bar}", {"bar": "bla"})) + + def test_broken(self): + self.assertEquals("foo ${bdkjfhsdkfh sdkfh ", + samba.substitute_var("foo ${bdkjfhsdkfh sdkfh ", {"bar": "bla"})) + + def test_unknown_var(self): + self.assertEquals("foo ${bla} gsff", + samba.substitute_var("foo ${bla} gsff", {"bar": "bla"})) + + def test_check_all_substituted(self): + samba.check_all_substituted("nothing to see here") + self.assertRaises(Exception, samba.check_all_substituted, + "Not subsituted: ${FOOBAR}") + + +class LdbExtensionTests(TestCaseInTempDir): + + def test_searchone(self): + path = self.tempdir + "/searchone.ldb" + l = samba.Ldb(path) + try: + l.add({"dn": "foo=dc", "bar": "bla"}) + self.assertEquals("bla", + l.searchone(basedn=ldb.Dn(l, "foo=dc"), attribute="bar")) + finally: + del l + os.unlink(path) diff --git a/source4/selftest/tests.sh b/source4/selftest/tests.sh index 2cd886811c..6db7a5116c 100755 --- a/source4/selftest/tests.sh +++ b/source4/selftest/tests.sh @@ -490,7 +490,7 @@ planpythontestsuite none samba.tests.security planpythontestsuite none samba.tests.dcerpc.misc planpythontestsuite none samba.tests.param planpythontestsuite none samba.tests.upgrade -planpythontestsuite none samba.tests +planpythontestsuite none samba.tests.core planpythontestsuite none samba.tests.provision planpythontestsuite none samba.tests.samba3 planpythontestsuite dc:local samba.tests.dcerpc.sam |