From 28766fb002ec2e700c056db396dd8e88df3da84d Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Thu, 29 Mar 2018 20:42:17 -0700 Subject: [PATCH] test: run test script with new "functional-tester" Signed-off-by: Gyuho Lee --- test | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/test b/test index 6549d6b97..10d0927ae 100755 --- a/test +++ b/test @@ -180,11 +180,10 @@ function integration_extra { function functional_pass { # Clean up any data and logs from previous runs - rm -rf ./agent-* + rm -rf /tmp/etcd-agent-data-* for a in 1 2 3; do - mkdir -p ./agent-$a - ./bin/etcd-agent -etcd-path ./bin/etcd -etcd-log-dir "./agent-$a" -port ":${a}9027" & + ./bin/etcd-agent --network tcp --address 127.0.0.1:${a}9027 & pid="$!" agent_pids="${agent_pids} $pid" done @@ -197,18 +196,7 @@ function functional_pass { done echo "Starting 'etcd-tester'" - ./bin/etcd-tester \ - -agent-endpoints "127.0.0.1:19027,127.0.0.1:29027,127.0.0.1:39027" \ - -client-ports 1379,2379,3379 \ - -advertise-client-ports 13790,23790,33790 \ - -peer-ports 1380,2380,3380 \ - -advertise-peer-ports 13800,23800,33800 \ - -limit 1 \ - -schedule-cases "0 1 2 3 4 5 6 7 8 9" \ - -stress-qps 1000 \ - -stress-key-txn-count 100 \ - -stress-key-txn-ops 10 \ - -exit-on-failure && echo "'etcd-tester' succeeded" + ./bin/etcd-tester --config ./tools/functional-tester/tester/local-test.yaml && echo "'etcd-tester' succeeded" ETCD_TESTER_EXIT_CODE=$? echo "ETCD_TESTER_EXIT_CODE:" ${ETCD_TESTER_EXIT_CODE}