diff options
| author | Tulio Casagrande <tcasagra@thoughtworks.com> | 2016-09-23 15:53:26 -0300 |
|---|---|---|
| committer | Tulio Casagrande <tcasagra@thoughtworks.com> | 2016-09-23 15:53:26 -0300 |
| commit | e70df3d6d654c13992d5f58b9c2b7606548e3316 (patch) | |
| tree | 4b824436c4462352fc2c4ce82df383c92066afaa /service | |
| parent | 62e7904d8791a600474ca6491db75eb9102a1093 (diff) | |
[#668] Put search index under pixelated subfolder
Diffstat (limited to 'service')
| -rw-r--r-- | service/pixelated/config/services.py | 2 | ||||
| -rw-r--r-- | service/test/support/integration/app_test_client.py | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/service/pixelated/config/services.py b/service/pixelated/config/services.py index f060c27c..f961e4b9 100644 --- a/service/pixelated/config/services.py +++ b/service/pixelated/config/services.py @@ -56,7 +56,7 @@ class Services(object): key = str(key_unicode) logger.debug('The key len is: %s' % len(key)) user_id = self._leap_session.user_auth.uuid - user_folder = os.path.join(self._leap_home, user_id) + user_folder = os.path.join(self._leap_home, 'pixelated', user_id) search_engine = SearchEngine(key, user_home=user_folder) self.search_engine = search_engine diff --git a/service/test/support/integration/app_test_client.py b/service/test/support/integration/app_test_client.py index 352ff9c6..edbb9784 100644 --- a/service/test/support/integration/app_test_client.py +++ b/service/test/support/integration/app_test_client.py @@ -64,12 +64,12 @@ class AppTestAccount(object): self._mail_address = '%s@pixelated.org' % user_id self._soledad = None self._services = None + self.soledad_test_folder = os.path.join(self._leap_home, 'pixelated', self._uuid) @defer.inlineCallbacks def start(self): - soledad_test_folder = os.path.join(self._leap_home, self._uuid) - self.soledad = yield initialize_soledad(tempdir=soledad_test_folder, uuid=self._uuid) - self.search_engine = SearchEngine(self.INDEX_KEY, user_home=soledad_test_folder) + self.soledad = yield initialize_soledad(tempdir=self.soledad_test_folder, uuid=self._uuid) + self.search_engine = SearchEngine(self.INDEX_KEY, user_home=self.soledad_test_folder) self.keymanager = mock() self.mail_sender = self._create_mail_sender() self.mail_store = SearchableMailStore(LeapMailStore(self.soledad), self.search_engine) @@ -105,8 +105,7 @@ class AppTestAccount(object): return self._services def cleanup(self): - soledad_test_folder = os.path.join(self._leap_home, self._uuid) - shutil.rmtree(soledad_test_folder) + shutil.rmtree(self.soledad_test_folder) def _initialize_account(self): self.account = Account(self.soledad, self._user_id) |