traffic: new version of model with packet_rate, version number

[samba.git] / python / samba / tests / provision.py

diff --git a/python/samba/tests/provision.py b/python/samba/tests/provision.py
index 929e7074f75a59d3f001bbddd1eeb741c308cd03..f51098629d8974b49a9f07c951a0c856e77d1b90 100644 (file)
--- a/python/samba/tests/provision.py
+++ b/python/samba/tests/provision.py
@@ -26,10 +26,11 @@ from samba.provision import (
     sanitize_server_role,
     setup_secretsdb,
     findnss,
-    )
+)
 import samba.tests
 from samba.tests import env_loadparm, TestCase
 
+
 def create_dummy_secretsdb(path, lp=None):
     """Create a dummy secrets database for use in tests.
 
@@ -42,6 +43,7 @@ def create_dummy_secretsdb(path, lp=None):
     paths = ProvisionPaths()
     paths.secrets = path
     paths.private_dir = os.path.dirname(path)
+    paths.binddns_dir = os.path.dirname(path)
     paths.keytab = "no.keytab"
     paths.dns_keytab = "no.dns.keytab"
     secrets_ldb = setup_secretsdb(paths, None, None, lp=lp)
@@ -57,22 +59,21 @@ class ProvisionTestCase(samba.tests.TestCaseInTempDir):
         path = os.path.join(self.tempdir, "secrets.ldb")
         paths = ProvisionPaths()
         secrets_tdb_path = os.path.join(self.tempdir, "secrets.tdb")
-        secrets_ntdb_path = os.path.join(self.tempdir, "secrets.ntdb")
         paths.secrets = path
         paths.private_dir = os.path.dirname(path)
+        paths.binddns_dir = os.path.dirname(path)
         paths.keytab = "no.keytab"
         paths.dns_keytab = "no.dns.keytab"
         ldb = setup_secretsdb(paths, None, None, lp=env_loadparm())
         try:
             self.assertEquals("LSA Secrets",
-                 ldb.searchone(basedn="CN=LSA Secrets", attribute="CN"))
+                              ldb.searchone(basedn="CN=LSA Secrets", attribute="CN").decode('utf8'))
         finally:
             del ldb
             os.unlink(path)
             if os.path.exists(secrets_tdb_path):
                 os.unlink(secrets_tdb_path)
-            if os.path.exists(secrets_ntdb_path):
-                os.unlink(secrets_ntdb_path)
+
 
 class FindNssTests(TestCase):
     """Test findnss() function."""
@@ -119,17 +120,14 @@ class Disabled(object):
     def test_join_domain(self):
         raise NotImplementedError(self.test_join_domain)
 
-    def test_vampire(self):
-        raise NotImplementedError(self.test_vampire)
-
 
 class SanitizeServerRoleTests(TestCase):
 
     def test_same(self):
         self.assertEquals("standalone server",
-            sanitize_server_role("standalone server"))
+                          sanitize_server_role("standalone server"))
         self.assertEquals("member server",
-            sanitize_server_role("member server"))
+                          sanitize_server_role("member server"))
 
     def test_invalid(self):
         self.assertRaises(ValueError, sanitize_server_role, "foo")
@@ -177,7 +175,7 @@ class ProvisionResultTests(TestCase):
         result = self.base_result()
         entries = self.report_logger(result)
         self.assertEquals(entries, [
-            ('INFO', 'Once the above files are installed, your Samba4 server '
+            ('INFO', 'Once the above files are installed, your Samba AD server '
                 'will be ready to use'),
             ('INFO', 'Server Role:           domain controller'),
             ('INFO', 'Hostname:              hostnaam'),
@@ -191,7 +189,7 @@ class ProvisionResultTests(TestCase):
         result.adminpass = "geheim"
         entries = self.report_logger(result)
         self.assertEquals(entries[1],
-                ("INFO", 'Admin password:        geheim'))
+                          ("INFO", 'Admin password:        geheim'))
 
 
 class DetermineNetbiosNameTests(TestCase):