samba-tool drs showrepl tests: don't assert existence of DNS partitions
authorDouglas Bagnall <douglas.bagnall@catalyst.net.nz>
Sat, 9 Jun 2018 08:35:30 +0000 (20:35 +1200)
committerAndrew Bartlett <abartlet@samba.org>
Sun, 10 Jun 2018 17:02:19 +0000 (19:02 +0200)
Because their existence is uncertain immediately after provision,
when these tests will run under some circumstances.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
source4/torture/drs/python/samba_tool_drs_showrepl.py

index 93fbc4ef414e18ea84b9a53b1bdfe0b52466d7b3..90bb0484a27922ac6f0985760068a2fcc4655746 100644 (file)
@@ -90,11 +90,12 @@ class SambaToolDrsShowReplTests(drs_base.DrsBaseTestCase):
                          r"DSA invocationId: %s" %
                          (HEX8_RE, GUID_RE, GUID_RE), header)
 
-        for p in ['DC=DomainDnsZones,DC=samba,DC=example,DC=com',
-                  'CN=Configuration,DC=samba,DC=example,DC=com',
+        # We don't assert the DomainDnsZones and ForestDnsZones are
+        # there because we don't know that they have been set up yet.
+
+        for p in ['CN=Configuration,DC=samba,DC=example,DC=com',
                   'DC=samba,DC=example,DC=com',
-                  'CN=Schema,CN=Configuration,DC=samba,DC=example,DC=com',
-                  'DC=ForestDnsZones,DC=samba,DC=example,DC=com']:
+                  'CN=Schema,CN=Configuration,DC=samba,DC=example,DC=com']:
             self.assertRegex(r'%s\n'
                              r'\tDefault-First-Site-Name\\[A-Z]+ via RPC\n'
                              r'\t\tDSA object GUID: %s\n'