From 67bdf4fa11f097144a831b51c424bdac3618a927 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 11 Jun 2012 10:50:08 +1000 Subject: lib/param: Use server role = 'standalone server' to be consistant with member server standalne is left as an alias. Andrew Bartlett --- source4/scripting/python/samba/tests/provision.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'source4/scripting/python/samba/tests') diff --git a/source4/scripting/python/samba/tests/provision.py b/source4/scripting/python/samba/tests/provision.py index 6ea3e60fb0..cfb6ded3c7 100644 --- a/source4/scripting/python/samba/tests/provision.py +++ b/source4/scripting/python/samba/tests/provision.py @@ -124,7 +124,8 @@ class Disabled(object): class SanitizeServerRoleTests(TestCase): def test_same(self): - self.assertEquals("standalone", sanitize_server_role("standalone")) + self.assertEquals("standalone server", + sanitize_server_role("standalone server")) self.assertEquals("member server", sanitize_server_role("member server")) @@ -132,7 +133,9 @@ class SanitizeServerRoleTests(TestCase): self.assertRaises(ValueError, sanitize_server_role, "foo") def test_valid(self): - self.assertEquals("standalone", sanitize_server_role("ROLE_STANDALONE")) + self.assertEquals("standalone server", sanitize_server_role("ROLE_STANDALONE")) + self.assertEquals("standalone server", sanitize_server_role("standalone")) + self.assertEquals("active directory domain controller", sanitize_server_role("domain controller")) class DummyLogger(object): -- cgit