pytests: move dsdb_dn tests out of common

dsdb_Dn hasn't been in samba.common since
85d2ff2f0003b106ca84866b7e7893723f1dd93c
and the tests should follow.

Although dsdb_Dn is currently in samba.samdb, we aren't moving the
tests to samba.tests.samdb, because those tests need a real AD
environment whereas these ones can run more cheaply in the "none"
environment.

Another patch will improve the remaining samba.common tests.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>

diff --git a/python/samba/tests/common.py b/python/samba/tests/common.py
index 1a7d9ad93607fb3fbb99a7475f88497a899f0814..a181fb700568e7790093ea0e5574a53acfa54349 100644 (file)
--- a/python/samba/tests/common.py
+++ b/python/samba/tests/common.py
@@ -18,49 +18,14 @@
 """Tests for samba.common"""
 
 import samba
-import os
 import samba.tests
 from samba.common import normalise_int32
-from samba.samdb import dsdb_Dn
 
 
-class CommonTests(samba.tests.TestCaseInTempDir):
+class CommonTests(samba.tests.TestCase):
 
     def test_normalise_int32(self):
         self.assertEqual('17', normalise_int32(17))
         self.assertEqual('17', normalise_int32('17'))
         self.assertEqual('-123', normalise_int32('-123'))
         self.assertEqual('-1294967296', normalise_int32('3000000000'))
-
-    def test_dsdb_Dn_binary(self):
-        url = self.tempdir + "/test_dsdb_Dn_binary.ldb"
-        sam = samba.Ldb(url=url)
-        dn1 = dsdb_Dn(sam, "DC=foo,DC=bar")
-        dn2 = dsdb_Dn(sam, "B:8:0000000D:<GUID=b3f0ec29-17f4-452a-b002-963e1909d101>;DC=samba,DC=example,DC=com")
-        self.assertEqual(dn2.binary, "0000000D")
-        self.assertEqual(13, dn2.get_binary_integer())
-        os.unlink(url)
-
-    def test_dsdb_Dn_sorted(self):
-        url = self.tempdir + "/test_dsdb_Dn_sorted.ldb"
-        sam = samba.Ldb(url=url)
-        try:
-            dn1 = dsdb_Dn(sam, "B:8:0000000D:<GUID=b3f0ec29-17f4-452a-b002-963e1909d101>;OU=dn1,DC=samba,DC=example,DC=com")
-            dn2 = dsdb_Dn(sam, "B:8:0000000C:<GUID=b3f0ec29-17f4-452a-b002-963e1909d101>;OU=dn1,DC=samba,DC=example,DC=com")
-            dn3 = dsdb_Dn(sam, "B:8:0000000F:<GUID=00000000-17f4-452a-b002-963e1909d101>;OU=dn3,DC=samba,DC=example,DC=com")
-            dn4 = dsdb_Dn(sam, "B:8:00000000:<GUID=ffffffff-17f4-452a-b002-963e1909d101>;OU=dn4,DC=samba,DC=example,DC=com")
-            dn5 = dsdb_Dn(sam, "<GUID=ffffffff-27f4-452a-b002-963e1909d101>;OU=dn5,DC=samba,DC=example,DC=com")
-            dn6 = dsdb_Dn(sam, "<GUID=00000000-27f4-452a-b002-963e1909d101>;OU=dn6,DC=samba,DC=example,DC=com")
-            unsorted_links14 = [dn1, dn2, dn3, dn4]
-            sorted_vals14 = [str(dn) for dn in sorted(unsorted_links14)]
-            self.assertEqual(sorted_vals14[0], str(dn3))
-            self.assertEqual(sorted_vals14[1], str(dn2))
-            self.assertEqual(sorted_vals14[2], str(dn1))
-            self.assertEqual(sorted_vals14[3], str(dn4))
-            unsorted_links56 = [dn5, dn6]
-            sorted_vals56 = [str(dn) for dn in sorted(unsorted_links56)]
-            self.assertEqual(sorted_vals56[0], str(dn6))
-            self.assertEqual(sorted_vals56[1], str(dn5))
-        finally:
-            del sam
-            os.unlink(url)

diff --git a/python/samba/tests/dsdb_dn.py b/python/samba/tests/dsdb_dn.py
new file mode 100644 (file)
index 0000000..c56cd5d
--- /dev/null
+++ b/python/samba/tests/dsdb_dn.py
@@ -0,0 +1,58 @@
+# Unix SMB/CIFS implementation. Tests for dsdb_dn objects
+# Copyright (C) Andrew Tridgell 2011
+#
+# 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/>.
+#
+
+"""Tests for dsdb_dn objects"""
+
+import os
+import samba
+from samba.samdb import dsdb_Dn
+from samba.tests import TestCaseInTempDir
+
+
+class DsdbDnTests(TestCaseInTempDir):
+    def test_dsdb_Dn_binary(self):
+        url = self.tempdir + "/test_dsdb_Dn_binary.ldb"
+        sam = samba.Ldb(url=url)
+        dn1 = dsdb_Dn(sam, "DC=foo,DC=bar")
+        dn2 = dsdb_Dn(sam, "B:8:0000000D:<GUID=b3f0ec29-17f4-452a-b002-963e1909d101>;DC=samba,DC=example,DC=com")
+        self.assertEqual(dn2.binary, "0000000D")
+        self.assertEqual(13, dn2.get_binary_integer())
+        os.unlink(url)
+
+    def test_dsdb_Dn_sorted(self):
+        url = self.tempdir + "/test_dsdb_Dn_sorted.ldb"
+        sam = samba.Ldb(url=url)
+        try:
+            dn1 = dsdb_Dn(sam, "B:8:0000000D:<GUID=b3f0ec29-17f4-452a-b002-963e1909d101>;OU=dn1,DC=samba,DC=example,DC=com")
+            dn2 = dsdb_Dn(sam, "B:8:0000000C:<GUID=b3f0ec29-17f4-452a-b002-963e1909d101>;OU=dn1,DC=samba,DC=example,DC=com")
+            dn3 = dsdb_Dn(sam, "B:8:0000000F:<GUID=00000000-17f4-452a-b002-963e1909d101>;OU=dn3,DC=samba,DC=example,DC=com")
+            dn4 = dsdb_Dn(sam, "B:8:00000000:<GUID=ffffffff-17f4-452a-b002-963e1909d101>;OU=dn4,DC=samba,DC=example,DC=com")
+            dn5 = dsdb_Dn(sam, "<GUID=ffffffff-27f4-452a-b002-963e1909d101>;OU=dn5,DC=samba,DC=example,DC=com")
+            dn6 = dsdb_Dn(sam, "<GUID=00000000-27f4-452a-b002-963e1909d101>;OU=dn6,DC=samba,DC=example,DC=com")
+            unsorted_links14 = [dn1, dn2, dn3, dn4]
+            sorted_vals14 = [str(dn) for dn in sorted(unsorted_links14)]
+            self.assertEqual(sorted_vals14[0], str(dn3))
+            self.assertEqual(sorted_vals14[1], str(dn2))
+            self.assertEqual(sorted_vals14[2], str(dn1))
+            self.assertEqual(sorted_vals14[3], str(dn4))
+            unsorted_links56 = [dn5, dn6]
+            sorted_vals56 = [str(dn) for dn in sorted(unsorted_links56)]
+            self.assertEqual(sorted_vals56[0], str(dn6))
+            self.assertEqual(sorted_vals56[1], str(dn5))
+        finally:
+            del sam
+            os.unlink(url)

diff --git a/selftest/tests.py b/selftest/tests.py
index 49fe5e6426bf16290334cd4ac7a5541647b15453..d7d13a6d609d21a91555387dc03586ae636a83b9 100644 (file)
--- a/selftest/tests.py
+++ b/selftest/tests.py
@@ -191,6 +191,7 @@ planpythontestsuite("none", "samba.tests.param")
 planpythontestsuite("none", "samba.tests.upgrade")
 planpythontestsuite("none", "samba.tests.core")
 planpythontestsuite("none", "samba.tests.common")
+planpythontestsuite("none", "samba.tests.dsdb_dn")
 planpythontestsuite("none", "samba.tests.provision")
 planpythontestsuite("none", "samba.tests.password_quality")
 planpythontestsuite("none", "samba.tests.strings")