changeset 497:fe271f8a4e58

Update to r528 to prevent test failures when `DefaultPermissionPolicy` is present but `CACHE_EXPIRY` is not (as on current Windows build slave)
author dfraser
date Tue, 15 Jul 2008 14:35:28 +0000
parents a0fa17e33348
children 17ad4028ba14
files bitten/tests/admin.py
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/bitten/tests/admin.py
+++ b/bitten/tests/admin.py
@@ -45,7 +45,7 @@
         self.env.config.set('trac', 'permission_store',
                             'DefaultPermissionStore')
         PermissionSystem(self.env).grant_permission('joe', 'BUILD_ADMIN')
-        if DefaultPermissionPolicy is not None:
+        if DefaultPermissionPolicy is not None and hasattr(DefaultPermissionPolicy, "CACHE_EXPIRY"):
             self.old_perm_cache_expiry = DefaultPermissionPolicy.CACHE_EXPIRY
             DefaultPermissionPolicy.CACHE_EXPIRY = 0
 
@@ -59,7 +59,7 @@
         self.env.get_repository = lambda authname=None: self.repos
 
     def tearDown(self):
-        if DefaultPermissionPolicy is not None:
+        if DefaultPermissionPolicy is not None and hasattr(DefaultPermissionPolicy, "CACHE_EXPIRY"):
             DefaultPermissionPolicy.CACHE_EXPIRY = self.old_perm_cache_expiry
         shutil.rmtree(self.env.path)
 
@@ -137,7 +137,7 @@
         PermissionSystem(self.env).grant_permission('joe', 'BUILD_CREATE')
         PermissionSystem(self.env).grant_permission('joe', 'BUILD_DELETE')
         PermissionSystem(self.env).grant_permission('joe', 'BUILD_MODIFY')
-        if DefaultPermissionPolicy is not None:
+        if DefaultPermissionPolicy is not None and hasattr(DefaultPermissionPolicy, "CACHE_EXPIRY"):
             self.old_perm_cache_expiry = DefaultPermissionPolicy.CACHE_EXPIRY
             DefaultPermissionPolicy.CACHE_EXPIRY = 0
 
@@ -151,7 +151,7 @@
         self.env.get_repository = lambda authname=None: self.repos
 
     def tearDown(self):
-        if DefaultPermissionPolicy is not None:
+        if DefaultPermissionPolicy is not None and hasattr(DefaultPermissionPolicy, "CACHE_EXPIRY"):
             DefaultPermissionPolicy.CACHE_EXPIRY = self.old_perm_cache_expiry
         shutil.rmtree(self.env.path)
 
Copyright (C) 2012-2017 Edgewall Software