summaryrefslogtreecommitdiff
path: root/tests/server-tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests/server-tests')
-rw-r--r--tests/server-tests/helpers/client_side_db.py3
-rw-r--r--tests/server-tests/white-box/soledad.rb2
2 files changed, 2 insertions, 3 deletions
diff --git a/tests/server-tests/helpers/client_side_db.py b/tests/server-tests/helpers/client_side_db.py
index 2f8c220f..5842c007 100644
--- a/tests/server-tests/helpers/client_side_db.py
+++ b/tests/server-tests/helpers/client_side_db.py
@@ -55,8 +55,7 @@ def get_soledad_instance(uuid, passphrase, basedir, server_url, cert_file,
local_db_path=local_db_path,
server_url=server_url,
cert_file=cert_file,
- auth_token=token,
- defer_encryption=True)
+ auth_token=token)
def _get_api_info(provider):
diff --git a/tests/server-tests/white-box/soledad.rb b/tests/server-tests/white-box/soledad.rb
index d41bee58..b89145bc 100644
--- a/tests/server-tests/white-box/soledad.rb
+++ b/tests/server-tests/white-box/soledad.rb
@@ -10,7 +10,7 @@ class Soledad < LeapTest
end
def test_00_Is_Soledad_running?
- assert_running '.*/usr/bin/twistd.*--wsgi=leap.soledad.server.application'
+ assert_running '/usr/bin/python /usr/bin/twistd --uid=soledad --gid=soledad --pidfile=/var/run/soledad.pid --syslog --prefix=soledad-server web --class=leap.soledad.server.resource.SoledadResource.*'
pass
end