github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #17418 from thockin/fix_examples_test 

try harder to timeout hung curls in examples test
pull/6/head
Tim Hockin 2015-11-17 23:54:49 -08:00
parent 0ed6432ff7 efe566621f
commit 2a92988392
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/k8petstore/k8petstore-loadbalancer.sh
View File

@ -253,7 +253,7 @@ function pollfor {
do do
### Just testing that the front end comes up. Not sure how to test total entries etc... (yet) ### Just testing that the front end comes up. Not sure how to test total entries etc... (yet)
echo "Trying curl ... $PUBLIC_IP:3000 , attempt $i . expect a few failures while pulling images... " echo "Trying curl ... $PUBLIC_IP:3000 , attempt $i . expect a few failures while pulling images... "
curl --connect-timeout 1 "$PUBLIC_IP:3000" > result curl --max-time 1 "$PUBLIC_IP:3000" > result
cat result cat result
cat result | grep -q "k8-bps" cat result | grep -q "k8-bps"
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
@ -279,7 +279,7 @@ function tests {
for i in `seq 1 $_SECONDS`; for i in `seq 1 $_SECONDS`;
do do
echo "curl : $PUBLIC_IP:3000 , $i of $_SECONDS" echo "curl : $PUBLIC_IP:3000 , $i of $_SECONDS"
curr_cnt="`curl --connect-timeout 1 "$PUBLIC_IP:3000/llen"`" curr_cnt="`curl --max-time 1 "$PUBLIC_IP:3000/llen"`"
### Write CSV File of # of trials / total transcations. ### Write CSV File of # of trials / total transcations.
echo "$i $curr_cnt" >> result echo "$i $curr_cnt" >> result
echo "total transactions so far : $curr_cnt" echo "total transactions so far : $curr_cnt"

4
examples/k8petstore/k8petstore-nodeport.sh
View File

@ -271,7 +271,7 @@ function pollfor {
do do
### Just testing that the front end comes up. Not sure how to test total entries etc... (yet) ### Just testing that the front end comes up. Not sure how to test total entries etc... (yet)
echo "Trying curl frontend:3000 via $TEST_IP:$NODE_PORT, attempt ${i}. Expect a few failures while pulling images... " echo "Trying curl frontend:3000 via $TEST_IP:$NODE_PORT, attempt ${i}. Expect a few failures while pulling images... "
curl --connect-timeout 1 "$TEST_IP:$NODE_PORT" > result curl --max-time 1 "$TEST_IP:$NODE_PORT" > result
cat result cat result
cat result | grep -q "k8-bps" cat result | grep -q "k8-bps"
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
@ -296,7 +296,7 @@ function tests {
for i in `seq 1 $_SECONDS`; for i in `seq 1 $_SECONDS`;
do do
echo "curl : $TEST_IP:$NODE_PORT , $i of $_SECONDS" echo "curl : $TEST_IP:$NODE_PORT , $i of $_SECONDS"
curr_cnt="`curl --connect-timeout 1 "$TEST_IP:$NODE_PORT/llen"`" curr_cnt="`curl --max-time 1 "$TEST_IP:$NODE_PORT/llen"`"
### Write CSV File of # of trials / total transcations. ### Write CSV File of # of trials / total transcations.
echo "$i $curr_cnt" >> result echo "$i $curr_cnt" >> result
echo "total transactions so far : $curr_cnt" echo "total transactions so far : $curr_cnt"

4
examples/k8petstore/k8petstore.sh
View File

@ -237,7 +237,7 @@ function pollfor {
do do
### Just testing that the front end comes up. Not sure how to test total entries etc... (yet) ### Just testing that the front end comes up. Not sure how to test total entries etc... (yet)
echo "Trying curl ... $PUBLIC_IP:3000 , attempt $i . expect a few failures while pulling images... " echo "Trying curl ... $PUBLIC_IP:3000 , attempt $i . expect a few failures while pulling images... "
curl --connect-timeout 1 "$PUBLIC_IP:3000" > result curl --max-time 1 "$PUBLIC_IP:3000" > result
cat result cat result
cat result | grep -q "k8-bps" cat result | grep -q "k8-bps"
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
@ -263,7 +263,7 @@ function tests {
for i in `seq 1 $_SECONDS`; for i in `seq 1 $_SECONDS`;
do do
echo "curl : $PUBLIC_IP:3000 , $i of $_SECONDS" echo "curl : $PUBLIC_IP:3000 , $i of $_SECONDS"
curr_cnt="`curl --connect-timeout 1 "$PUBLIC_IP:3000/llen"`" curr_cnt="`curl --max-time 1 "$PUBLIC_IP:3000/llen"`"
### Write CSV File of # of trials / total transcations. ### Write CSV File of # of trials / total transcations.
echo "$i $curr_cnt" >> result echo "$i $curr_cnt" >> result
echo "total transactions so far : $curr_cnt" echo "total transactions so far : $curr_cnt"