summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrebs <drebs@riseup.net>2016-05-01 17:25:33 -0300
committerdrebs <drebs@riseup.net>2016-05-02 20:43:25 -0300
commit1de2723fdd05dc2c404d9bb7213dd7b93d0c50f6 (patch)
tree9aaf1e99395de2a0db8096e21487e6240a6b22e8
parent69c5c2b052c51b037142abd495fd59a8a4698fbc (diff)
add script to run tests
-rwxr-xr-xrun-test.sh16
-rw-r--r--server_with_soledad_syncer.py5
-rw-r--r--soledad_sync.py2
3 files changed, 20 insertions, 3 deletions
diff --git a/run-test.sh b/run-test.sh
new file mode 100755
index 0000000..7cc84d8
--- /dev/null
+++ b/run-test.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+CLI="python /home/drebs/projetos/leap/repos/soledad/scripts/soledad_test_env/soledad_test_env.py"
+${CLI} couch start
+${CLI} user-db delete
+${CLI} user-db create
+${CLI} shared-db create
+${CLI} token-db create
+${CLI} token-db insert-token
+${CLI} soledad-server start
+
+make soledad-sync-server | grep -v stats | grep -v ping &
+sleep 5
+make measure-series &
+sleep 5
+make trigger-sync
diff --git a/server_with_soledad_syncer.py b/server_with_soledad_syncer.py
index 3d495b6..456e3dc 100644
--- a/server_with_soledad_syncer.py
+++ b/server_with_soledad_syncer.py
@@ -3,11 +3,10 @@
import os
-import datetime
from klein import run, route, resource
-from twisted.internet import reactor
-
import soledad_sync as sync
+from twisted.internet import reactor
+import datetime
@route('/start-sync')
diff --git a/soledad_sync.py b/soledad_sync.py
index 525b988..e291d68 100644
--- a/soledad_sync.py
+++ b/soledad_sync.py
@@ -13,6 +13,8 @@ NUM_DOCS = int(parser.get('sync', 'num_docs'))
PAYLOAD = parser.get('sync', 'payload')
+
+
DO_THESEUS = os.environ.get('THESEUS', False)