From 814ecd2f5e078aa333f391483333a236961d46e7 Mon Sep 17 00:00:00 2001 From: drebs Date: Tue, 12 Jul 2016 07:00:12 +0200 Subject: [test] remove extra setUpEnv/tearDownEnv The setUpEnv and tearDownEnv methods are configured to run on setUpClass/tearDownClass. Some testing systems as trial don't support that, and that seems to cause some confusion in some systems, causing double attempts to setup or teardown, and thus failing intermitently. This commit removes the extra call to setUpEnv and tearDownEnv on tests on this repository, as it now uses py.test to run tests, which supports setUpClass and tearDownClass. --- tests/common.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/common.py b/tests/common.py index e532200..8eb5d4e 100644 --- a/tests/common.py +++ b/tests/common.py @@ -37,7 +37,6 @@ ADDRESS_2 = 'anotheruser@leap.se' class KeyManagerWithSoledadTestCase(unittest.TestCase, BaseLeapTest): def setUp(self): - self.setUpEnv() self.gpg_binary_path = self._find_gpg() self._soledad = Soledad( @@ -57,7 +56,6 @@ class KeyManagerWithSoledadTestCase(unittest.TestCase, BaseLeapTest): # wait for the indexes to be ready for the tear down d = km._openpgp.deferred_init d.addCallback(lambda _: self.delete_all_keys(km)) - d.addCallback(lambda _: self.tearDownEnv()) d.addCallback(lambda _: self._soledad.close()) return d -- cgit v1.2.3