diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5d0516d3d..ecae95a37 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -78,5 +78,5 @@ jobs: runs-on: ubuntu-latest steps: - name: run persistence tests - run: ./test/persist/test_failure_indices.sh - shell: bash + working-directory: test/persist + run: ./test_failure_indices.sh diff --git a/test/persist/test_simple.sh b/test/persist/test_simple.sh deleted file mode 100644 index 706e04c26..000000000 --- a/test/persist/test_simple.sh +++ /dev/null @@ -1,70 +0,0 @@ -#! /bin/bash - - -export TMHOME=$HOME/.tendermint_persist - -rm -rf $TMHOME -tendermint init - -function start_procs(){ - name=$1 - echo "Starting persistent kvstore and tendermint" - abci-cli kvstore --persist $TMHOME/kvstore &> "kvstore_${name}.log" & - PID_DUMMY=$! - tendermint node &> tendermint_${name}.log & - PID_TENDERMINT=$! - sleep 5 -} - -function kill_procs(){ - kill -9 $PID_DUMMY $PID_TENDERMINT -} - - -function send_txs(){ - # send a bunch of txs over a few blocks - echo "Sending txs" - for i in `seq 1 5`; do - for j in `seq 1 100`; do - tx=`head -c 8 /dev/urandom | hexdump -ve '1/1 "%.2X"'` - curl -s 127.0.0.1:26657/broadcast_tx_async?tx=0x$tx &> /dev/null - done - sleep 1 - done -} - - -start_procs 1 -send_txs -kill_procs - -start_procs 2 - -# wait for node to handshake and make a new block -addr="localhost:26657" -curl -s $addr/status > /dev/null -ERR=$? -i=0 -while [ "$ERR" != 0 ]; do - sleep 1 - curl -s $addr/status > /dev/null - ERR=$? - i=$(($i + 1)) - if [[ $i == 10 ]]; then - echo "Timed out waiting for tendermint to start" - exit 1 - fi -done - -# wait for a new block -h1=`curl -s $addr/status | jq .result.sync_info.latest_block_height` -h2=$h1 -while [ "$h2" == "$h1" ]; do - sleep 1 - h2=`curl -s $addr/status | jq .result.sync_info.latest_block_height` -done - -kill_procs -sleep 2 - -echo "Passed Test: Persistence" diff --git a/test/persist/txs.sh b/test/persist/txs.sh deleted file mode 100644 index 120aa8a56..000000000 --- a/test/persist/txs.sh +++ /dev/null @@ -1,23 +0,0 @@ -#! /bin/bash -set -u - -# wait till node is up, send txs -ADDR=$1 #="127.0.0.1:26657" -curl -s $ADDR/status > /dev/null -ERR=$? -while [ "$ERR" != 0 ]; do - sleep 1 - curl -s $ADDR/status > /dev/null - ERR=$? -done - -# send a bunch of txs over a few blocks -echo "Node is up, sending txs" -for i in $(seq 1 5); do - for _ in $(seq 1 100); do - tx=$(head -c 8 /dev/urandom | hexdump -ve '1/1 "%.2X"') - curl -s "$ADDR/broadcast_tx_async?tx=0x$tx" &> /dev/null - done - echo "sent 100" - sleep 1 -done