[Libreoffice-commits] online.git: loolwsd/test

Ashod Nakashian ashod.nakashian at collabora.co.uk
Sat Apr 30 14:37:58 UTC 2016


 loolwsd/test/.gitignore     |    1 -
 loolwsd/test/run_unit.sh.in |    2 --
 2 files changed, 3 deletions(-)

New commits:
commit 59b475570d9c568289486537fa94b38f14cb5425
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Sat Apr 30 10:25:21 2016 -0400

    loolwsd: no need to sleep before running tests
    
    Since lokit process counting waits until WSD
    is ready (i.e. until it has created lokit processes,)
    there is no need to sleep explicitly anymore.
    Provided, of course, we always call the lokit
    process counter before running any tests, which we
    currently do.
    
    Change-Id: Idf7ad925688251f1c81ef8628530714d2dc92d9c
    Reviewed-on: https://gerrit.libreoffice.org/24528
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loolwsd/test/.gitignore b/loolwsd/test/.gitignore
index 908d52e..3a7e5fe 100644
--- a/loolwsd/test/.gitignore
+++ b/loolwsd/test/.gitignore
@@ -10,4 +10,3 @@ Makefile.in
 *.o
 test
 run_unit.sh
-run_test.sh
diff --git a/loolwsd/test/run_unit.sh.in b/loolwsd/test/run_unit.sh.in
index b6305d2..f2daf63 100755
--- a/loolwsd/test/run_unit.sh.in
+++ b/loolwsd/test/run_unit.sh.in
@@ -49,8 +49,6 @@ if test "z$test_mode" == "zold"; then
                                  --childroot="$jails_path" \
                                  --allowlocalstorage  2> "$tst_log" &
 
-     echo "  waiting for loolwsd to start"
-     sleep 1 # sad - need to add a wait to the start of test.cpp ...
      echo "  executing test"
 
      oldpath=`pwd`


More information about the Libreoffice-commits mailing list