1 files changed, 5 insertions, 10 deletions

diff --git a/src/mailman/model/tests/test_domain.py b/src/mailman/model/tests/test_domain.py
index ffa79e32e..950c34969 100644
--- a/src/mailman/model/tests/test_domain.py
+++ b/src/mailman/model/tests/test_domain.py
@@ -81,18 +81,14 @@ class TestDomainManager(unittest.TestCase):
         self.assertRaises(KeyError, self._manager.remove, 'doesnotexist.com')
 
     def test_domain_create_with_owner(self):
-        user = getUtility(IUserManager).create_user('someuser@somedomain.org')
+        user = getUtility(IUserManager).create_user('someuser@example.org')
         config.db.commit()
-        domain = self._manager.add('example.org', owner_id=user.id)
+        domain = self._manager.add('example.org', owner=user)
         self.assertEqual(len(domain.owners), 1)
         self.assertEqual(domain.owners[0].id, user.id)
 
-    def test_domain_create_with_non_existent_owner(self):
-        with self.assertRaises(BadDomainSpecificationError):
-            self._manager.add('testdomain.org', owner_id=100)
-
     def test_add_domain_owner(self):
-        user = getUtility(IUserManager).create_user('someuser@somedomain.org')
+        user = getUtility(IUserManager).create_user('someuser@example.org')
         config.db.commit()
         domain = self._manager.add('example.org')
         domain.add_owner(user)
@@ -102,7 +98,7 @@ class TestDomainManager(unittest.TestCase):
     def test_remove_domain_owner(self):
         user = getUtility(IUserManager).create_user('someuser@somedomain.org')
         config.db.commit()
-        domain = self._manager.add('example.org', owner_id=user.id)
+        domain = self._manager.add('example.org', owner=user)
         domain.remove_owner(user)
         self.assertEqual(len(domain.owners), 0)
 
@@ -140,5 +136,4 @@ class TestDomainLifecycleEvents(unittest.TestCase):
         self.assertEqual(listmanager.get('fly@example.com'), fly)
 
     def test_owners_are_deleted_when_domain_is(self):
-        #TODO: Complete this
-        pass
+        self._domainmanager.remove('example.net')