summaryrefslogtreecommitdiff
path: root/testing/test_soledad
diff options
context:
space:
mode:
authorVictor Shyba <victor1984@riseup.net>2016-11-19 04:13:52 -0300
committerdrebs <drebs@leap.se>2016-12-12 09:15:21 -0200
commit1804b5f74a4efa6b25c06fe353ac960fd42e4fb6 (patch)
treee3e8a66c85758a8a0ab3af77dde367b1394474da /testing/test_soledad
parent378a07113a713a7c25f0fb8510d18ecdae2198bd (diff)
[tests] migrate pytest to trial
test_deprecated_crypto was using pytest, which unfortunately doesnt work when mixed with trial. Migrated back. Also added norecursedirs option back, as it is necessary for parallel testing mode.
Diffstat (limited to 'testing/test_soledad')
-rw-r--r--testing/test_soledad/util.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/testing/test_soledad/util.py b/testing/test_soledad/util.py
index 4a705396..57f8199b 100644
--- a/testing/test_soledad/util.py
+++ b/testing/test_soledad/util.py
@@ -56,7 +56,7 @@ from leap.soledad.server.auth import SoledadTokenAuthMiddleware
PASSWORD = '123456'
-ADDRESS = 'leap@leap.se'
+ADDRESS = 'user-1234'
def make_local_db_and_target(test):