# HG changeset patch # User dfraser # Date 1216132528 0 # Node ID fe271f8a4e582e08a276014cc375f2ec377f04e8 # Parent a0fa17e33348dd11bb45173e428a2bfec2da196c Update to r528 to prevent test failures when `DefaultPermissionPolicy` is present but `CACHE_EXPIRY` is not (as on current Windows build slave) diff --git a/bitten/tests/admin.py b/bitten/tests/admin.py --- 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)