Merge branch 'master' into signup

6 files changed, 21 insertions, 10 deletions

diff --git a/service/pixelated/maintenance.py b/service/pixelated/maintenance.py
index 74b5a369..a2286034 100644
--- a/service/pixelated/maintenance.py
+++ b/service/pixelated/maintenance.py
@@ -105,7 +105,8 @@ def add_command_callback(args, prepareDeferred, finalizeDeferred):
         prepareDeferred.addCallback(load_mails, args.file)
         prepareDeferred.addCallback(flush_to_soledad, finalizeDeferred)
     elif args.command == 'markov-generate':
-        prepareDeferred.addCallback(markov_generate, args.file, int(args.limit), args.seed)
+        prepareDeferred.addCallback(
+            markov_generate, args.file, int(args.limit), args.seed)
         prepareDeferred.addCallback(flush_to_soledad, finalizeDeferred)
     elif args.command == 'dump-soledad':
         prepareDeferred.addCallback(dump_soledad)
diff --git a/service/pixelated/resources/login_resource.py b/service/pixelated/resources/login_resource.py
index 905b872c..fec4307e 100644
--- a/service/pixelated/resources/login_resource.py
+++ b/service/pixelated/resources/login_resource.py
@@ -178,7 +178,7 @@ class LoginResource(BaseResource):
 
     def _complete_bootstrap(self, user_auth, request):
         def log_error(error):
-            log.error('Login error during %s services setup: %s' % (user_auth.username, error.getErrorMessage()))
+            log.error('Login error during %s services setup: %s \n %s' % (user_auth.username, error.getErrorMessage(), error.getTraceback()))
 
         def set_session_cookies(_):
             session = IPixelatedSession(request.getSession())
diff --git a/service/requirements.txt b/service/requirements.txt
index c6eea0d3..56ac19d8 100644
--- a/service/requirements.txt
+++ b/service/requirements.txt
@@ -6,9 +6,9 @@ requests==2.11.1
 srp==1.0.6
 whoosh==2.6.0
 Twisted==16.1.1
--e 'git+https://github.com/pixelated/leap_pycommon.git@develop#egg=leap.common'
--e 'git+https://github.com/leapcode/bitmask-dev.git@master#egg=leap.bitmask'
--e 'git+https://github.com/pixelated/soledad.git@develop#egg=leap.soledad.common&subdirectory=common/'
--e 'git+https://github.com/pixelated/soledad.git@develop#egg=leap.soledad.client&subdirectory=client/'
--e 'git+https://github.com/pixelated/soledad.git@develop#egg=leap.soledad.server&subdirectory=server/'
+-e 'git+https://0xacab.org/pixelated/leap_pycommon.git@develop#egg=leap.common'
+-e 'git+https://0xacab.org/pixelated/bitmask-dev.git@master#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/'
 -e .
diff --git a/service/test/functional/features/steps/login.py b/service/test/functional/features/steps/login.py
index e2dc1381..2a653030 100644
--- a/service/test/functional/features/steps/login.py
+++ b/service/test/functional/features/steps/login.py
@@ -13,8 +13,16 @@
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
+import time
+
 from behave import when, then
-from common import *
+from selenium.webdriver.common.by import By
+
+from common import (
+    fill_by_css_selector,
+    find_element_by_css_selector,
+    MULTI_USER_URL,
+    wait_until_element_is_visible_by_locator)
 
 
 @when(u'I open the login page')
diff --git a/service/test/support/test_helper.py b/service/test/support/test_helper.py
index 3323a14e..fbff5819 100644
--- a/service/test/support/test_helper.py
+++ b/service/test/support/test_helper.py
@@ -100,7 +100,7 @@ class TestRequest:
 class PixRequestMock(DummyRequest):
     def __init__(self, path):
         DummyRequest.__init__(self, path)
-        self.path = "/".join(path)
+        self.path = '/' + "/".join(path)
         self.content = None
         self.code = None
         self.cookies = {}
@@ -121,7 +121,7 @@ class PixRequestMock(DummyRequest):
 
 
 def request_mock(path='', method='GET', body='', headers={}, ajax=True, csrf='token'):
-    dummy = PixRequestMock(path.split('/'))
+    dummy = PixRequestMock(path[1:].split('/'))
     for name, val in headers.iteritems():
         dummy.requestHeaders.setRawHeaders(name.lower(), [val])
     dummy.method = method
diff --git a/service/test/unit/config/test_sessions.py b/service/test/unit/config/test_sessions.py
index 98e5c69e..a7e62c7a 100644
--- a/service/test/unit/config/test_sessions.py
+++ b/service/test/unit/config/test_sessions.py
@@ -14,9 +14,11 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
 
+import os
 from mock import patch
 from mock import MagicMock
 from twisted.internet import defer
+from twisted.trial import unittest
 from pixelated.config.sessions import LeapSession, SessionCache
 
 from test.unit.bitmask_libraries.test_abstract_leap import AbstractLeapTest