diff options
-rw-r--r-- | provisioning/modules/pixelated/manifests/source/install_useragent.pp | 6 | ||||
-rw-r--r-- | service/pixelated/config/sessions.py | 2 | ||||
-rw-r--r-- | service/test/unit/config/test_sessions.py | 9 |
3 files changed, 8 insertions, 9 deletions
diff --git a/provisioning/modules/pixelated/manifests/source/install_useragent.pp b/provisioning/modules/pixelated/manifests/source/install_useragent.pp index f8e9690a..0b19eeb3 100644 --- a/provisioning/modules/pixelated/manifests/source/install_useragent.pp +++ b/provisioning/modules/pixelated/manifests/source/install_useragent.pp @@ -2,7 +2,7 @@ # and make sure venv is activated on login class pixelated::source::install_useragent { - $virtualenv_path = '/home/vagrant/user-agent-venv' + $virtualenv_path = '/home/vagrant/.venvs/pixua' exec { 'install-pixelated': # use of "user" parameter doesn't set env variables right, @@ -24,8 +24,8 @@ class pixelated::source::install_useragent { } exec { 'add_custom_node_modules_to_bashrc': - command => "/bin/bash -c 'echo \"source /home/vagrant/user-agent-venv/bin/activate\" >> /home/vagrant/.bashrc'", - unless => "/bin/grep \"source /home/vagrant/user-agent-venv/bin/activate\" /home/vagrant/.bashrc", + command => "/bin/bash -c 'echo \"source ${virtualenv_path}/bin/activate\" >> /home/vagrant/.bashrc'", + unless => "/bin/grep \"source ${virtualenv_path}/bin/activate\" /home/vagrant/.bashrc", user => 'vagrant', require => [Exec['install-pixelated'], File['/home/vagrant/activate_custom_node_modules.sh']] } diff --git a/service/pixelated/config/sessions.py b/service/pixelated/config/sessions.py index 2bad3e32..b4d69d29 100644 --- a/service/pixelated/config/sessions.py +++ b/service/pixelated/config/sessions.py @@ -154,7 +154,7 @@ class LeapSession(object): self.account = None self._has_been_initially_synced = False self._is_closed = False - register(events.KEYMANAGER_FINISHED_KEY_GENERATION, self._set_fresh_account, uid=self.account_email()) + register(events.KEYMANAGER_FINISHED_KEY_GENERATION, self._set_fresh_account, uid=self.account_email(), replace=True) @defer.inlineCallbacks def first_required_sync(self): diff --git a/service/test/unit/config/test_sessions.py b/service/test/unit/config/test_sessions.py index e2254eae..06bffc97 100644 --- a/service/test/unit/config/test_sessions.py +++ b/service/test/unit/config/test_sessions.py @@ -74,13 +74,12 @@ class SessionTest(AbstractLeapTest): yield session.sync() self.soledad_session.sync.assert_called_once() - def test_session_registers_to_generated_keys(self): + @patch('pixelated.config.sessions.register') + def test_session_registers_to_generated_keys(self, register_mock): email = 'someone@somedomain.tld' self.provider.address_for.return_value = email - with patch('pixelated.config.sessions.register') as register_mock: - session = self._create_session() - - register_mock.assert_called_once_with(KEYMANAGER_FINISHED_KEY_GENERATION, session._set_fresh_account, uid=email) + session = self._create_session() + register_mock.assert_called_once_with(KEYMANAGER_FINISHED_KEY_GENERATION, session._set_fresh_account, uid=email, replace=True) @patch('pixelated.config.sessions.register') def test_close_unregisters_from_generate_keys_events(self, _): |