diff options
| -rw-r--r-- | tests/integration/keymanager/test_keymanager.py | 6 | ||||
| -rw-r--r-- | tox.ini | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/tests/integration/keymanager/test_keymanager.py b/tests/integration/keymanager/test_keymanager.py index 656b070c..2e4a9a97 100644 --- a/tests/integration/keymanager/test_keymanager.py +++ b/tests/integration/keymanager/test_keymanager.py @@ -172,11 +172,9 @@ class KeyManagerKeyManagementTestCase(KeyManagerWithSoledadTestCase): @defer.inlineCallbacks def test_get_public_key_fetches_remotely_if_key_expired(self): - km = self._key_manager() - nicknym_response = {'address': ADDRESS, - 'openpgp': DIFFERENT_PUBLIC_KEY} + km = self._key_manager(user=ADDRESS_2) km._nicknym.fetch_key_with_address = mock.Mock( - return_value=nicknym_response) + return_value=DIFFERENT_PUBLIC_KEY) # put key yield km._openpgp.put_raw_key(PUBLIC_KEY, ADDRESS) @@ -50,7 +50,7 @@ commands = py.test -k 'not bench' --pep8 -x {posargs} deps = -r{toxinidir}/pkg/requirements-testing.pip - -egit+https://github.com/isislovecruft/python-gnupg.git@develop#egg=gnupg + gnupg -e../leap_commondev -e../soledad setenv = @@ -61,7 +61,7 @@ setenv = commands = py.test {posargs} changedir = bench deps = - -egit+https://github.com/isislovecruft/python-gnupg.git@develop#egg=gnupg + gnupg pytest pytest-benchmark # need the next 2 for graphs, but new version changed api a bit and is |