summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorAaron Haslett <aaronhaslett@catalyst.net.nz>2019-02-12 13:31:57 +1300
committerAndrew Bartlett <abartlet@samba.org>2019-04-11 04:17:11 +0000
commit350fc49e94525232c3556a3ace108f6e1447a490 (patch)
tree4e327b551d8b6eccadc4f6aa54aa1d0b240f32aa /python
parent4336c058cabd0a11f48ae76dff4e15e85013e783 (diff)
downloadsamba-350fc49e94525232c3556a3ace108f6e1447a490.tar.gz
selftest: tagging tests for new schemaupgrade_dc target
Tagging schema tests against schemaupgrade_dc test target and fixing some DN assertions to be more generic. Signed-off-by: Aaron Haslett <aaronhaslett@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Diffstat (limited to 'python')
-rw-r--r--python/samba/tests/samba_tool/schema.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/python/samba/tests/samba_tool/schema.py b/python/samba/tests/samba_tool/schema.py
index 6d502ef4e17..7a80b33cd26 100644
--- a/python/samba/tests/samba_tool/schema.py
+++ b/python/samba/tests/samba_tool/schema.py
@@ -42,7 +42,7 @@ class SchemaCmdTestCase(SambaToolCmdTest):
self.assertCmdSuccess(result, out, err)
self.assertEquals(err, "", "Shouldn't be any error messages")
- self.assertIn("dn: CN=uid,CN=Schema,CN=Configuration,DC=samba,DC=example,DC=com", out)
+ self.assertIn("dn: CN=uid,CN=Schema,CN=Configuration,", out)
def test_modify_attribute_searchflags(self):
"""Tests that we can modify searchFlags of an attribute"""
@@ -62,7 +62,7 @@ class SchemaCmdTestCase(SambaToolCmdTest):
self.assertCmdSuccess(result, out, err)
self.assertEquals(err, "", "Shouldn't be any error messages")
- self.assertIn("modified cn=uid,CN=Schema,CN=Configuration,DC=samba,DC=example,DC=com", out)
+ self.assertIn("modified cn=uid,CN=Schema,CN=Configuration,", out)
(result, out, err) = self.runsublevelcmd("schema", ("attribute",
"modify"), "uid",
@@ -73,7 +73,7 @@ class SchemaCmdTestCase(SambaToolCmdTest):
self.assertCmdSuccess(result, out, err)
self.assertEquals(err, "", "Shouldn't be any error messages")
- self.assertIn("modified cn=uid,CN=Schema,CN=Configuration,DC=samba,DC=example,DC=com", out)
+ self.assertIn("modified cn=uid,CN=Schema,CN=Configuration,", out)
(result, out, err) = self.runsublevelcmd("schema", ("attribute",
"modify"), "uid",
@@ -84,7 +84,7 @@ class SchemaCmdTestCase(SambaToolCmdTest):
self.assertCmdSuccess(result, out, err)
self.assertEquals(err, "", "Shouldn't be any error messages")
- self.assertIn("modified cn=uid,CN=Schema,CN=Configuration,DC=samba,DC=example,DC=com", out)
+ self.assertIn("modified cn=uid,CN=Schema,CN=Configuration,", out)
def test_show_oc_attribute(self):
"""Tests that we can modify searchFlags of an attribute"""
@@ -109,4 +109,4 @@ class SchemaCmdTestCase(SambaToolCmdTest):
self.assertCmdSuccess(result, out, err)
self.assertEquals(err, "", "Shouldn't be any error messages")
- self.assertIn("dn: CN=Person,CN=Schema,CN=Configuration,DC=samba,DC=example,DC=com", out)
+ self.assertIn("dn: CN=Person,CN=Schema,CN=Configuration,", out)