summaryrefslogtreecommitdiff
path: root/source4/scripting/python/samba/tests/provision.py
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-06-11 10:50:08 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-06-15 09:18:33 +0200
commit67bdf4fa11f097144a831b51c424bdac3618a927 (patch)
treec63ecbf054a2f571a630e7a56421c712ba622b39 /source4/scripting/python/samba/tests/provision.py
parent11db5b1f3321b3d5b73bb16f4030111c9a35fbbe (diff)
downloadsamba-67bdf4fa11f097144a831b51c424bdac3618a927.tar.gz
samba-67bdf4fa11f097144a831b51c424bdac3618a927.tar.bz2
samba-67bdf4fa11f097144a831b51c424bdac3618a927.zip
lib/param: Use server role = 'standalone server' to be consistant with member server
standalne is left as an alias. Andrew Bartlett
Diffstat (limited to 'source4/scripting/python/samba/tests/provision.py')
-rw-r--r--source4/scripting/python/samba/tests/provision.py7
1 files changed, 5 insertions, 2 deletions
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):