Mercurial > bitten > bitten-test
changeset 500:6a9268d10d09
Port of [566] to trunk.
| author | wbell |
|---|---|
| date | Sat, 13 Dec 2008 21:32:54 +0000 |
| parents | 79a422aeae7e |
| children | ed56b65cd903 a3bcc4f98187 |
| files | bitten/build/tests/pythontools.py bitten/tests/admin.py |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/bitten/build/tests/pythontools.py +++ b/bitten/build/tests/pythontools.py @@ -237,7 +237,7 @@ self.assertEqual([], self.ctxt.output) def test_summary_with_absolute_path(self): - filename = '%s/test/module.py' % self.ctxt.basedir + filename = os.sep.join([self.ctxt.basedir, 'test', 'module.py']) pickle.dump({ filename: set([1, 4, 5]), }, self.summary) @@ -320,7 +320,7 @@ return filename[len(self.basedir) + 1:] def test_absolute_path(self): - filename = '%s/test/module.py' % self.ctxt.basedir + filename = os.sep.join([self.ctxt.basedir, 'test', 'module.py']) self._create_file('test', 'module.py') filenames = pythontools._normalize_filenames( self.ctxt, [filename],
--- a/bitten/tests/admin.py +++ b/bitten/tests/admin.py @@ -47,7 +47,7 @@ PermissionSystem(self.env).grant_permission('joe', 'BUILD_ADMIN') if DefaultPermissionPolicy is not None and hasattr(DefaultPermissionPolicy, "CACHE_EXPIRY"): self.old_perm_cache_expiry = DefaultPermissionPolicy.CACHE_EXPIRY - DefaultPermissionPolicy.CACHE_EXPIRY = 0 + DefaultPermissionPolicy.CACHE_EXPIRY = -1 # Hook up a dummy repository self.repos = Mock( @@ -139,7 +139,7 @@ PermissionSystem(self.env).grant_permission('joe', 'BUILD_MODIFY') if DefaultPermissionPolicy is not None and hasattr(DefaultPermissionPolicy, "CACHE_EXPIRY"): self.old_perm_cache_expiry = DefaultPermissionPolicy.CACHE_EXPIRY - DefaultPermissionPolicy.CACHE_EXPIRY = 0 + DefaultPermissionPolicy.CACHE_EXPIRY = -1 # Hook up a dummy repository self.repos = Mock(