summaryrefslogtreecommitdiff
path: root/service/test/support
diff options
context:
space:
mode:
authorNavaL <mnandri@thoughtworks.com>2016-02-03 13:44:13 +0100
committerNavaL <mnandri@thoughtworks.com>2016-02-03 13:49:54 +0100
commit4873b25259b7ec1c060e32993857a183314eaa66 (patch)
tree90c1d0c0e3ccf72074b75a21c307a581fcc381f7 /service/test/support
parenta57953de3be89533be11c5d346fb98ab210954bc (diff)
checks to load leap sessions and services or not
Issue #590
Diffstat (limited to 'service/test/support')
-rw-r--r--service/test/support/integration/multi_user_client.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/service/test/support/integration/multi_user_client.py b/service/test/support/integration/multi_user_client.py
index 692dc5e9..19833c9f 100644
--- a/service/test/support/integration/multi_user_client.py
+++ b/service/test/support/integration/multi_user_client.py
@@ -13,8 +13,6 @@
#
# You should have received a copy of the GNU Affero General Public License
# along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
-
-
from leap.exceptions import SRPAuthenticationError
from mockito import mock, when, any as ANY
from twisted.internet import defer
@@ -27,7 +25,7 @@ from pixelated.bitmask_libraries.session import LeapSession, LeapSessionFactory
import pixelated.config.services
from pixelated.resources.root_resource import RootResource
from test.support.integration import AppTestClient
-from test.support.integration.app_test_client import initialize_soledad, AppTestAccount
+from test.support.integration.app_test_client import AppTestAccount
import test.support.mockito
from test.support.test_helper import request_mock
@@ -60,9 +58,8 @@ class MultiUserClient(AppTestClient):
leap_session.config = config
leap_session.fresh_account = False
- mock_srp_auth = 'mocked so irrelevant but just need a return value'
- self._set_leap_srp_auth(username, password, mock_srp_auth)
- when(LeapSessionFactory).create(username, password, mock_srp_auth).thenReturn(leap_session)
+ self._set_leap_srp_auth(username, password, user_auth)
+ when(LeapSessionFactory).create(username, password, user_auth).thenReturn(leap_session)
when(leap_session).initial_sync().thenAnswer(lambda: defer.succeed(None))
when(pixelated.config.services).Services(ANY()).thenReturn(self._test_account.services)