minor changes in integration tests

pull/245/head
zelig 10 years ago
parent 3bdf28c1fe
commit 69dfca2feb
  1. 6
      eth/test/tests/02.sh
  2. 4
      eth/test/tests/03.sh
  3. 6
      eth/test/tests/common.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

@ -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

@ -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"
}

Loading…
Cancel
Save