[tor-commits] [sbws/master] CI: run scanner using the test network

[juga at torproject.org]

commit adcaf04d52d2e11bec2cf63f31b153e76aea3ecd
Author: juga0 <juga at riseup.net>
Date:   Wed Jan 9 18:23:26 2019 +0000

    CI: run scanner using the test network
    
    as part of the integration tests.
    
    Fixes bug #28933. Bugfix v0.1.0.
---
 tox.ini | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index eb6a958..d8fd1c4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -43,15 +43,21 @@ whitelist_externals =
     bash
     sleep
     wget
+    mkdir
 commands =
     tar -C {envtmpdir} -vxf {toxinidir}/tests/integration/net.tar
     bash {envtmpdir}/net/start.sh
     bash -c "time python3 {envtmpdir}/net/wait.py {envtmpdir}/net/{auth,relay,exit}*"
     bash -c "python3 {toxinidir}/scripts/tools/sbws-http-server.py --port 28888 &>/dev/null &"
-    sleep 15
+    sleep 1
     wget -O/dev/null http://127.0.0.1:28888/sbws.bin
+    ; Run actually the scanner
+    mkdir -p /tmp/.sbws
+    ; This add around 3min more to the tests
+    sbws -c {toxinidir}/tests/integration/sbws_testnet.ini scanner
     coverage run -a --rcfile={toxinidir}/.coveragerc --source=sbws -m pytest -s {toxinidir}/tests/integration -vv
     bash {envtmpdir}/net/stop.sh
+    rm -rf /tmp/.sbws
 
 [testenv:lint]
 skip_install = True