summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2016-07-12 07:00:12 +0200
committerRuben Pollan <meskio@sindominio.net>2016-07-12 16:40:46 +0200
commitbd67cb4c8ea9edbdeb47817fac5c25db95a73f43 (patch)
tree0caee75f2c4b89fe7f001ce33ece88cc46e0b027
parent4c6838a1fc3784fc74ea9a27b41a88321eb39061 (diff)
[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.
-rw-r--r--keymanager/tests/common.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/keymanager/tests/common.py b/keymanager/tests/common.py
index e532200e..8eb5d4e3 100644
--- a/keymanager/tests/common.py
+++ b/keymanager/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