Index: /main/waeup.kofa/trunk/src/waeup/kofa/tests/test_async.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/tests/test_async.py	(revision 9792)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/tests/test_async.py	(revision 9793)
@@ -14,4 +14,6 @@
 from zope.container.interfaces import IContainer
 from zope.interface import verify
+from zope.site.folder import rootFolder
+from zope.site.testing import createSiteManager
 from waeup.kofa.interfaces import (
     WAEUP_KEY, IProgressable, IJobManager, IJobContainer
@@ -113,4 +115,43 @@
         manager = getUtility(IJobManager)
         self.assertTrue(isinstance(manager, JobManager))
+        return
+
+    def test_get_site_no_site(self):
+        # if no site is around, we get a lookup error
+        manager = getUtility(IJobManager)
+        self.assertRaises(LookupError, manager._get_site, None)
+        return
+
+    def test_get_site_invalid_site(self):
+        # if we pass an invalid site, we get a lookup error
+        manager = getUtility(IJobManager)
+        self.assertRaises(LookupError, manager._get_site, object())
+        return
+
+    def test_get_site_valid_site(self):
+        # if we pass a valid site, that will be respected
+        manager = getUtility(IJobManager)
+        result = manager._get_site(self.root_folder)
+        self.assertEqual(result, self.root_folder)
+        return
+
+    def test_get_site_externally_set_site(self):
+        # if, however, a site was set externally, it will be found
+        # even if passed in site is not valid
+        manager = getUtility(IJobManager)
+        site = rootFolder()
+        self.root_folder['application'] = site
+        createSiteManager(site, setsite=True)
+        transaction.commit()
+        result1 = manager._get_site(None)     # no site given
+        result2 = manager._get_site(site)     # valid site given
+        result3 = manager._get_site(object()) # invalid site given
+        result4 = manager._get_site(self.root_folder) # valid persisted obj
+        # we always get the externally set site...
+        self.assertEqual(result1, site)
+        self.assertEqual(result2, site)
+        self.assertEqual(result3, site)
+        # except if the passed object is already a valid persisted one
+        self.assertEqual(result4, self.root_folder)
         return
 
