diff options
| author | NavaL <ayoyo@thoughtworks.com> | 2016-12-05 18:03:24 +0100 |
|---|---|---|
| committer | Thais Siqueira <thais.siqueira@gmail.com> | 2017-01-02 14:29:45 -0200 |
| commit | 15794e7e624a22e87ca75a28804f97930e06a855 (patch) | |
| tree | 79ab66e7c54da4c044c993e7dda91ab1ee33e522 | |
| parent | d731d03e277b10f689dc2402d59b80952eb3d2c4 (diff) | |
[#851] minor refactoring, and using the right keymanager branch
| -rw-r--r-- | service/pixelated/bitmask_libraries/keymanager.py | 2 | ||||
| -rw-r--r-- | service/requirements.txt | 2 | ||||
| -rw-r--r-- | service/test/unit/bitmask_libraries/test_keymanager.py | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/service/pixelated/bitmask_libraries/keymanager.py b/service/pixelated/bitmask_libraries/keymanager.py index 3a6f54c9..6024dd71 100644 --- a/service/pixelated/bitmask_libraries/keymanager.py +++ b/service/pixelated/bitmask_libraries/keymanager.py @@ -49,7 +49,7 @@ class Keymanager(object): current_key = yield self._key_exists(self._email) if not current_key: yield self._generate_key_and_send_to_leap() - elif current_key.should_be_renewed(DEFAULT_EXTENSION_THRESHOLD): + elif current_key.needs_renewal(DEFAULT_EXTENSION_THRESHOLD): yield self._regenerate_key() yield self._send_key_to_leap() diff --git a/service/requirements.txt b/service/requirements.txt index 3bd22f13..7503a23c 100644 --- a/service/requirements.txt +++ b/service/requirements.txt @@ -7,7 +7,7 @@ srp==1.0.6 whoosh==2.6.0 Twisted==16.1.1 -e 'git+https://0xacab.org/pixelated/leap_pycommon.git@develop#egg=leap.common' --e 'git+https://0xacab.org/pixelated/bitmask-dev.git@feat_regenerate_key#egg=leap.bitmask' +-e 'git+https://0xacab.org/pixelated/bitmask-dev.git@feat_fetch_remote_on_expiry#egg=leap.bitmask' -e 'git+https://0xacab.org/pixelated/soledad.git@develop#egg=leap.soledad.common&subdirectory=common/' -e 'git+https://0xacab.org/pixelated/soledad.git@develop#egg=leap.soledad.client&subdirectory=client/' -e 'git+https://0xacab.org/pixelated/soledad.git@develop#egg=leap.soledad.server&subdirectory=server/' diff --git a/service/test/unit/bitmask_libraries/test_keymanager.py b/service/test/unit/bitmask_libraries/test_keymanager.py index ef5edcea..eb6ba79b 100644 --- a/service/test/unit/bitmask_libraries/test_keymanager.py +++ b/service/test/unit/bitmask_libraries/test_keymanager.py @@ -80,7 +80,7 @@ class KeymanagerTest(TestCase): def test_keymanager_generate_openpgp_key_doesnt_regenerate_preexisting_key(self): mock_open_pgp_key = MagicMock() - mock_open_pgp_key.should_be_renewed = MagicMock(return_value=False) + mock_open_pgp_key.needs_renewal = MagicMock(return_value=False) when(self.keymanager)._key_exists('test_user@some-server.test').thenReturn(mock_open_pgp_key) self.keymanager._gen_key = MagicMock() @@ -91,7 +91,7 @@ class KeymanagerTest(TestCase): def test_keymanager_generate_openpgp_key_doesnt_upload_preexisting_key(self): mock_open_pgp_key = MagicMock() - mock_open_pgp_key.should_be_renewed = MagicMock(return_value=False) + mock_open_pgp_key.needs_renewal = MagicMock(return_value=False) when(self.keymanager)._key_exists('test_user@some-server.test').thenReturn(mock_open_pgp_key) self.keymanager._send_key_to_leap = MagicMock() @@ -115,7 +115,7 @@ class KeymanagerTest(TestCase): @defer.inlineCallbacks def test_keymanager_regenerate_key_pair_if_current_key_is_about_to_expire(self): mock_open_pgp_key = MagicMock() - mock_open_pgp_key.should_be_renewed.return_value(True) + mock_open_pgp_key.needs_renewal.return_value(True) when(self.keymanager)._key_exists('test_user@some-server.test').thenReturn(mock_open_pgp_key) yield self.keymanager.generate_openpgp_key() @@ -126,7 +126,7 @@ class KeymanagerTest(TestCase): @defer.inlineCallbacks def test_key_regeneration_does_not_delete_key_when_upload_fails(self): mock_open_pgp_key = MagicMock() - mock_open_pgp_key.should_be_renewed.return_value(True) + mock_open_pgp_key.needs_renewal.return_value(True) self.leap_keymanager.get_key = MagicMock(return_value=defer.succeed(mock_open_pgp_key)) self.leap_keymanager.send_key = MagicMock(side_effect=UploadKeyError('Could not upload key')) |