[tor-commits] [tor/master] Add test-network delay option

[nickm at torproject.org]

commit bae73343902072c24469d42deffe90b22b7fff6e
Author: teor <teor2345 at gmail.com>
Date:   Wed Oct 1 18:05:04 2014 +1000

    Add test-network delay option
    
    Add a --delay option to test-network.sh, which configures the delay before
    the chutney network tests for data transmission. The default remains at
    18 seconds if the argument isn't specified.
    
    Apparently we should be using bootstrap status for this (eventually).
    
    Partially implements ticket 13161.
---
 changes/feature13161-test-network-delay-option |    4 ++++
 src/test/test-network.sh                       |    6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/changes/feature13161-test-network-delay-option b/changes/feature13161-test-network-delay-option
new file mode 100644
index 0000000..1cf2e71
--- /dev/null
+++ b/changes/feature13161-test-network-delay-option
@@ -0,0 +1,4 @@
+  o Minor features (testing):
+    - Add a --delay option to test-network.sh, which configures the delay
+      before the chutney network tests for data transmission.
+      Partially implements ticket 13161.
diff --git a/src/test/test-network.sh b/src/test/test-network.sh
index e1bed5c..4fe4e63 100755
--- a/src/test/test-network.sh
+++ b/src/test/test-network.sh
@@ -17,6 +17,10 @@ do
       export NETWORK_FLAVOUR="$2"
       shift
     ;;
+    --delay|--sleep|--bootstrap-time|--time)
+      export BOOTSTRAP_TIME="$2"
+      shift
+    ;;
     *)
       echo "Sorry, I don't know what to do with '$1'."
       exit 2
@@ -41,7 +45,7 @@ PATH="$TOR_DIR/src/or:$TOR_DIR/src/tools:$PATH"
 
 # Sleep some, waiting for the network to bootstrap.
 # TODO: Add chutney command 'bootstrap-status' and use that instead.
-BOOTSTRAP_TIME=18
+BOOTSTRAP_TIME=${BOOTSTRAP_TIME:-18}
 $ECHO_N "$myname: sleeping for $BOOTSTRAP_TIME seconds"
 n=$BOOTSTRAP_TIME; while [ $n -gt 0 ]; do
     sleep 1; n=$(expr $n - 1); $ECHO_N .