diff options
| author | Tulio Casagrande <tcasagra@thoughtworks.com> | 2016-09-26 14:03:39 -0300 |
|---|---|---|
| committer | Tulio Casagrande <tcasagra@thoughtworks.com> | 2016-09-26 14:03:39 -0300 |
| commit | 1dcedb66938c654e85cdfd0baef00865b8728315 (patch) | |
| tree | fc0214a5da40917e7a5e490e7471f0d0c9d890d8 | |
| parent | bc82002e703118b2347c59106080da03ea69b5c8 (diff) | |
[#668] Moved user folder under pixelated subfolder
| -rw-r--r-- | service/pixelated/config/services.py | 3 | ||||
| -rw-r--r-- | service/test/support/integration/app_test_client.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/service/pixelated/config/services.py b/service/pixelated/config/services.py index f961e4b9..116e903a 100644 --- a/service/pixelated/config/services.py +++ b/service/pixelated/config/services.py @@ -20,6 +20,7 @@ class Services(object): def __init__(self, leap_session): self._leap_home = leap_config.leap_home + self._pixelated_home = os.path.join(self._leap_home, 'pixelated') self._leap_session = leap_session @defer.inlineCallbacks @@ -56,7 +57,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, 'pixelated', user_id) + user_folder = os.path.join(self._pixelated_home, 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 edbb9784..02a44da1 100644 --- a/service/test/support/integration/app_test_client.py +++ b/service/test/support/integration/app_test_client.py @@ -60,11 +60,12 @@ class AppTestAccount(object): def __init__(self, user_id, leap_home): self._user_id = user_id self._leap_home = leap_home + self._pixelated_home = os.path.join(self._leap_home, 'pixelated') self._uuid = str(uuid.uuid4()) 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) + self.soledad_test_folder = os.path.join(self._pixelated_home, self._uuid) @defer.inlineCallbacks def start(self): |