Browse Source

test: run test script with new "functional-tester"

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
Gyuho Lee 7 years ago
parent
commit
28766fb002
1 changed files with 3 additions and 15 deletions
  1. 3 15
      test

+ 3 - 15
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}