From 738ed5d91b9c2ae35e8ad4f4f1e6738fb3b6d31d Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 15 Aug 2015 17:07:09 +0200 Subject: [PATCH] 2 small archiver testsuite fixes environment context manager: if a env var was not present before, it should not be present afterwards teardown: cd out of the tmpdir before deleting it --- borg/testsuite/archiver.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/borg/testsuite/archiver.py b/borg/testsuite/archiver.py index 2ed2f7821..1f1be2bf0 100644 --- a/borg/testsuite/archiver.py +++ b/borg/testsuite/archiver.py @@ -58,7 +58,9 @@ class environment_variable: def __exit__(self, *args, **kw): for k, v in self.old_values.items(): - if v is not None: + if v is None: + del os.environ[k] + else: os.environ[k] = v @@ -89,8 +91,8 @@ class ArchiverTestCaseBase(BaseTestCase): os.chdir(self.tmpdir) def tearDown(self): - shutil.rmtree(self.tmpdir) os.chdir(self._old_wd) + shutil.rmtree(self.tmpdir) def cmd(self, *args, **kw): exit_code = kw.get('exit_code', 0)