diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-14 00:23:48 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-14 00:23:48 +0800 |
| commit | 7336dfad02833989037440fb22e01566444d0100 (patch) | |
| tree | 8f7dc62676e519236b69a977c7af00d81b1e0406 /eth/test | |
| parent | c9985bf563888d5f346408d2ff174167e8b65880 (diff) | |
| parent | 00fca409398172811e71158e0ca9f6229e0f815b (diff) | |
| download | dexon-7336dfad02833989037440fb22e01566444d0100.tar dexon-7336dfad02833989037440fb22e01566444d0100.tar.gz dexon-7336dfad02833989037440fb22e01566444d0100.tar.bz2 dexon-7336dfad02833989037440fb22e01566444d0100.tar.lz dexon-7336dfad02833989037440fb22e01566444d0100.tar.xz dexon-7336dfad02833989037440fb22e01566444d0100.tar.zst dexon-7336dfad02833989037440fb22e01566444d0100.zip | |
Merge branch 'develop' into poc8
Diffstat (limited to 'eth/test')
| -rw-r--r-- | eth/test/tests/02.sh | 6 | ||||
| -rw-r--r-- | eth/test/tests/03.sh | 4 | ||||
| -rw-r--r-- | eth/test/tests/common.sh | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/eth/test/tests/02.sh b/eth/test/tests/02.sh index 5231dbd78..619217ed8 100644 --- a/eth/test/tests/02.sh +++ b/eth/test/tests/02.sh @@ -12,8 +12,8 @@ EOF peer 11 01 peer 12 02 -P13ID=$PID +P12ID=$PID test_node $NAME "" -loglevel 5 $JSFILE -sleep 0.5 -kill $P13ID +sleep 0.3 +kill $P12ID diff --git a/eth/test/tests/03.sh b/eth/test/tests/03.sh index 8c9d6565e..d7dba737f 100644 --- a/eth/test/tests/03.sh +++ b/eth/test/tests/03.sh @@ -1,10 +1,10 @@ #!/bin/bash -TIMEOUT=35 +TIMEOUT=12 cat >> $JSFILE <<EOF eth.addPeer("localhost:30311"); -sleep(30000); +sleep(10000); eth.export("$CHAIN_TEST"); EOF diff --git a/eth/test/tests/common.sh b/eth/test/tests/common.sh index 74db073f7..f66cfb43e 100644 --- a/eth/test/tests/common.sh +++ b/eth/test/tests/common.sh @@ -3,14 +3,14 @@ # launched by run.sh function test_node { rm -rf $DIR/$1 - ARGS="-datadir $DIR/$1 -debug debug -seed=false -shh=false -id test$1" + ARGS="-datadir $DIR/$1 -debug debug -seed=false -shh=false -id test$1 -port 303$1" if [ "" != "$2" ]; then chain="chains/$2.chain" echo "import chain $chain" $ETH $ARGS -loglevel 3 -chain $chain | grep CLI |grep import fi - echo "starting test node $1 with extra args ${@:3}" - $ETH $ARGS -port 303$1 ${@:3} & + echo "starting test node $1 with args $ARGS ${@:3}" + $ETH $ARGS ${@:3} & PID=$! PIDS="$PIDS $PID" } |