Merge remote-tracking branch 'drebs/feature/2356-prevent-some-db-actions-in-server' into develop

1 files changed, 5 insertions, 4 deletions

diff --git a/src/leap/soledad/tests/test_sqlcipher.py b/src/leap/soledad/tests/test_sqlcipher.py
index 5bfb8de6..dfc5577b 100644
--- a/src/leap/soledad/tests/test_sqlcipher.py
+++ b/src/leap/soledad/tests/test_sqlcipher.py
@@ -24,11 +24,10 @@ Test sqlcipher backend internals.
 import os
 import time
 import unittest
-try:
-    import simplejson as json
-except ImportError:
-    import json  # noqa
+import simplejson as json
 import threading
+
+
 from pysqlcipher import dbapi2
 from StringIO import StringIO
 
@@ -440,6 +439,7 @@ def sync_via_synchronizer_and_leap(test, db_source, db_target,
         test.skipTest("full trace hook unsupported over http")
     path = test._http_at[db_target]
     target = LeapSyncTarget.connect(test.getURL(path), test._soledad._crypto)
+    target.set_token_credentials('user-uuid', 'auth-token')
     if trace_hook_shallow:
         target._set_trace_hook_shallow(trace_hook_shallow)
     return sync.Synchronizer(db_source, target).sync()
@@ -663,6 +663,7 @@ def _make_local_db_and_leap_target(test, path='test'):
     test.startServer()
     db = test.request_state._create_database(os.path.basename(path))
     st = LeapSyncTarget.connect(test.getURL(path), test._soledad._crypto)
+    st.set_token_credentials('user-uuid', 'auth-token')
     return db, st