dsdb/tests/ldap: fix test_ldapServiceName against w2k8r2
authorStefan Metzmacher <metze@samba.org>
Sun, 22 Sep 2013 21:40:12 +0000 (23:40 +0200)
committerStefan Metzmacher <metze@samba.org>
Tue, 24 Sep 2013 16:55:32 +0000 (18:55 +0200)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
source4/dsdb/tests/python/ldap.py

index 0a95b2a103f21f76ca8b0fa45cc438ed5cd7a49f..f44f4eaf57a45bf6eeb06588bc0ed90dc182f501 100755 (executable)
@@ -2980,12 +2980,16 @@ class BaseDnTests(samba.tests.TestCase):
     def test_ldapServiceName(self):
         """Testing the ldap service name in rootDSE"""
         res = self.ldb.search("", scope=SCOPE_BASE,
-                              attrs=["ldapServiceName", "dNSHostName"])
+                              attrs=["ldapServiceName", "dnsHostName"])
         self.assertEquals(len(res), 1)
+        self.assertTrue("ldapServiceName" in res[0])
+        self.assertTrue("dnsHostName" in res[0])
 
-        (hostname, _, dns_domainname) = res[0]["dNSHostName"][0].partition(".")
-        self.assertTrue(":%s$@%s" % (hostname, dns_domainname.upper())
-                        in res[0]["ldapServiceName"][0])
+        (hostname, _, dns_domainname) = res[0]["dnsHostName"][0].partition(".")
+
+        given = res[0]["ldapServiceName"][0]
+        expected = "%s:%s$@%s" % (dns_domainname.lower(), hostname.lower(), dns_domainname.upper())
+        self.assertEquals(given, expected)
 
 if not "://" in host:
     if os.path.isfile(host):