# HG changeset patch # User cmlenz # Date 1127757462 0 # Node ID 206711a0b276ff0c0fab99ce24c731ff87ecf0ce # Parent 17e4b8d01db6e8c67f0b7f45f4e2aba168dba3ea Fix test failure on windows, where a temporary directory could not be deleted due to insufficient permissions. diff --git a/bitten/util/tests/archive.py b/bitten/util/tests/archive.py --- a/bitten/util/tests/archive.py +++ b/bitten/util/tests/archive.py @@ -93,9 +93,14 @@ self.assertRaises(archive.Error, archive.pack, self.env, repos) def test_pack_insufficient_perms(self): - os.chmod(os.path.join(self.env.path, 'snapshots'), 0500) - repos = Mock(get_node=lambda path, rev: Mock(isdir=True)) - self.assertRaises(archive.Error, archive.pack, self.env, repos) + try: + os.chmod(os.path.join(self.env.path, 'snapshots'), 0500) + repos = Mock(get_node=lambda path, rev: Mock(isdir=True)) + self.assertRaises(archive.Error, archive.pack, self.env, repos) + finally: + # Revert permissions, otherwise the environment directory can't be + # deleted on windows + os.chmod(os.path.join(self.env.path, 'snapshots'), 0700) class UnpackTestCase(unittest.TestCase):