diff options
| author | Matthieu Patou <mat@matws.net> | 2011-11-02 20:24:20 +0100 |
|---|---|---|
| committer | Matthieu Patou <mat@samba.org> | 2011-11-02 22:35:00 +0100 |
| commit | 2db221c3845e2b1c44f8237c550704dca41df91a (patch) | |
| tree | 975f963c077cabf56898fe756fadfab26e0db708 /source4/dsdb/tests | |
| parent | 23d3880725da4cb92062b5945b7c93202f4ea504 (diff) | |
| download | samba-2db221c3845e2b1c44f8237c550704dca41df91a.tar.gz samba-2db221c3845e2b1c44f8237c550704dca41df91a.tar.bz2 samba-2db221c3845e2b1c44f8237c550704dca41df91a.zip | |
s4-sites: Document, fix under optimal coding, use exceptions
Autobuild-User: Matthieu Patou <mat@samba.org>
Autobuild-Date: Wed Nov 2 22:35:00 CET 2011 on sn-devel-104
Diffstat (limited to 'source4/dsdb/tests')
| -rw-r--r-- | source4/dsdb/tests/python/sites.py | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/source4/dsdb/tests/python/sites.py b/source4/dsdb/tests/python/sites.py index d3f5c5769f..8b984b2fe8 100644 --- a/source4/dsdb/tests/python/sites.py +++ b/source4/dsdb/tests/python/sites.py @@ -80,7 +80,6 @@ class SitesBaseTests(samba.tests.TestCase): #tests on sites class SimpleSitesTests(SitesBaseTests): - def test_create(self): """test creation of 1 site""" @@ -88,30 +87,31 @@ class SimpleSitesTests(SitesBaseTests): ok = sites.create_site(self.ldb_admin, self.ldb_admin.get_config_basedn(), "testsamba") self.ldb_admin.transaction_commit() - self.assertTrue(ok) - ok = False - try: - ok = sites.create_site(self.ldb_admin, self.ldb_admin.get_config_basedn(), - "testsamba") - self.assertFalse(ok) - except: - self.assertFalse(ok) + + self.assertRaises(sites.SiteAlreadyExistsException, + sites.create_site, self.ldb_admin, self.ldb_admin.get_config_basedn(), + "testsamba") def test_delete(self): - """test creation of 1 site""" + """test removal of 1 site""" self.ldb_admin.transaction_start() ok = sites.delete_site(self.ldb_admin, self.ldb_admin.get_config_basedn(), "testsamba") + self.ldb_admin.transaction_commit() - self.assertTrue(ok) - ok = False - try: - ok = sites.delete_site(self.ldb_admin, self.ldb_admin.get_config_basedn(), - "testsamba") - self.assertFalse(ok) - except: - self.assertFalse(ok) + + self.assertRaises(sites.SiteNotFoundException, + sites.delete_site, self.ldb_admin, self.ldb_admin.get_config_basedn(), + "testsamba") + + + def test_delete_not_empty(self): + """test removal of 1 site with servers""" + + self.assertRaises(sites.SiteServerNotEmptyException, + sites.delete_site, self.ldb_admin, self.ldb_admin.get_config_basedn(), + "Default-First-Site-Name") ldb = SamDB(ldapshost, credentials=creds, session_info=system_session(lp), lp=lp) |