From 678a211ca31a7801d8bef8a74ca30feaa16af508 Mon Sep 17 00:00:00 2001
From: drebs <drebs@riseup.net>
Date: Fri, 18 Nov 2016 18:03:26 -0200
Subject: add a timeout for the soledad sync test script (#8590)

If for any reason a sync takes too long, the script will timeout and log
an errro.
---
 tests/server-tests/helpers/soledad_sync.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/tests/server-tests/helpers/soledad_sync.py b/tests/server-tests/helpers/soledad_sync.py
index f4fc81ae..b674818d 100755
--- a/tests/server-tests/helpers/soledad_sync.py
+++ b/tests/server-tests/helpers/soledad_sync.py
@@ -35,6 +35,7 @@ flags.set_events_enabled(False)
 
 NUMDOCS = 1
 USAGE = "Usage: %s uuid token server cert_file password" % sys.argv[0]
+SYNC_TIMEOUT = 60
 
 
 def bail(msg, exitcode):
@@ -68,12 +69,23 @@ if __name__ == '__main__':
     s = get_soledad_instance(
         uuid, passphrase, tempdir, server, cert_file, token)
 
+    def syncWithTimeout(_):
+        d = s.sync()
+        reactor.callLater(SYNC_TIMEOUT, d.cancel)
+        return d
+
     def onSyncDone(sync_result):
         print "SYNC_RESULT:", sync_result
         s.close()
         rm_tempdir()
         reactor.stop()
 
+    def trap_cancel(f):
+        f.trap(defer.CancelledError)
+        log.err("sync timed out after %s seconds" % SYNC_TIMEOUT)
+        rm_tempdir()
+        reactor.stop()
+
     def log_and_exit(f):
         log.err(f)
         rm_tempdir()
@@ -81,8 +93,9 @@ if __name__ == '__main__':
 
     def start_sync():
         d = create_docs(s)
-        d.addCallback(lambda _: s.sync())
+        d.addCallback(syncWithTimeout)
         d.addCallback(onSyncDone)
+        d.addErrback(trap_cancel)
         d.addErrback(log_and_exit)
 
     reactor.callWhenRunning(start_sync)
-- 
cgit v1.2.3


From 389228df6ee52ce41cc83c2b91fe0b6572d4bc50 Mon Sep 17 00:00:00 2001
From: drebs <drebs@riseup.net>
Date: Fri, 18 Nov 2016 18:16:41 -0200
Subject: use lock to avoid running multiple soledad tests (#8590)

If a soledad sync test script is already running, there's no need to run
another one. This avoids having multiple test script hanging and eating
up resources.

We have seen this situation under development circumstances, when the
soledad server has been modified in a way that the client hangs and
never finishes.
---
 tests/server-tests/helpers/soledad_sync.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tests/server-tests/helpers/soledad_sync.py b/tests/server-tests/helpers/soledad_sync.py
index b674818d..a92ec68f 100755
--- a/tests/server-tests/helpers/soledad_sync.py
+++ b/tests/server-tests/helpers/soledad_sync.py
@@ -27,6 +27,7 @@ os.environ['SKIP_TWISTED_SSL_CHECK'] = '1'
 
 from twisted.internet import defer, reactor
 from twisted.python import log
+from twisted.python.lockfile import FilesystemLock
 
 from client_side_db import get_soledad_instance
 from leap.common.events import flags
@@ -43,6 +44,13 @@ def bail(msg, exitcode):
     sys.exit(exitcode)
 
 
+def obtain_lock():
+    scriptname = os.path.basename(__file__)
+    lockfile = os.path.join(tempfile.gettempdir(), scriptname + '.lock')
+    lock = FilesystemLock(lockfile)
+    return lock.lock()
+
+
 def create_docs(soledad):
     """
     Populates the soledad database with dummy messages, so we can exercise
@@ -65,6 +73,9 @@ if __name__ == '__main__':
     if len(sys.argv) < 6:
         bail(USAGE, 2)
 
+    if not obtain_lock():
+        bail("another instance is already running", 1)
+
     uuid, token, server, cert_file, passphrase = sys.argv[1:]
     s = get_soledad_instance(
         uuid, passphrase, tempdir, server, cert_file, token)
-- 
cgit v1.2.3