Skip to content

Commit 337b815

Browse files
authored
interop: build client without timeout; add logs to help debug failures (#5294)
1 parent e583b19 commit 337b815

File tree

4 files changed

+25
-9
lines changed

4 files changed

+25
-9
lines changed

.github/workflows/testing.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,6 @@ jobs:
5050
goversion: 1.18
5151
testflags: -race
5252

53-
- type: extras
54-
goversion: 1.18
55-
5653
- type: tests
5754
goversion: 1.18
5855
goarch: 386
@@ -70,6 +67,9 @@ jobs:
7067
- type: tests
7168
goversion: 1.15
7269

70+
- type: extras
71+
goversion: 1.18
72+
7373
steps:
7474
# Setup the environment.
7575
- name: Setup GOARCH
@@ -114,8 +114,13 @@ jobs:
114114
- name: Run extras tests
115115
if: matrix.type == 'extras'
116116
run: |
117+
export TERM=${TERM:-xterm}
117118
go version
119+
echo -e "\n-- Running Examples --"
118120
examples/examples_test.sh
121+
echo -e "\n-- Running AdvancedTLS Examples --"
119122
security/advancedtls/examples/examples_test.sh
123+
echo -e "\n-- Running Interop Test --"
120124
interop/interop_test.sh
125+
echo -e "\n-- Running xDS E2E Test --"
121126
xds/internal/test/e2e/run.sh

interop/client/client.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ const (
107107

108108
func main() {
109109
flag.Parse()
110+
logger.Infof("Client running with test case %q", *testCase)
110111
var useGDC bool // use google default creds
111112
var useCEC bool // use compute engine creds
112113
if *customCredentialsType != "" {

interop/interop_test.sh

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ clean () {
3636
}
3737

3838
fail () {
39-
echo "$(tput setaf 1) $1 $(tput sgr 0)"
39+
echo "$(tput setaf 1) $(date): $1 $(tput sgr 0)"
4040
clean
4141
exit 1
4242
}
4343

4444
pass () {
45-
echo "$(tput setaf 2) $1 $(tput sgr 0)"
45+
echo "$(tput setaf 2) $(date): $1 $(tput sgr 0)"
4646
}
4747

4848
# Don't run some tests that need a special environment:
@@ -73,29 +73,38 @@ CASES=(
7373
)
7474

7575
# Build server
76+
echo "$(tput setaf 4) $(date): building server $(tput sgr 0)"
7677
if ! go build -o /dev/null ./interop/server; then
7778
fail "failed to build server"
7879
else
7980
pass "successfully built server"
8081
fi
8182

83+
# Build client
84+
echo "$(tput setaf 4) $(date): building client $(tput sgr 0)"
85+
if ! go build -o /dev/null ./interop/client; then
86+
fail "failed to build client"
87+
else
88+
pass "successfully built client"
89+
fi
90+
8291
# Start server
8392
SERVER_LOG="$(mktemp)"
84-
go run ./interop/server --use_tls &> $SERVER_LOG &
93+
GRPC_GO_LOG_SEVERITY_LEVEL=info go run ./interop/server --use_tls &> $SERVER_LOG &
8594

8695
for case in ${CASES[@]}; do
87-
echo "$(tput setaf 4) testing: ${case} $(tput sgr 0)"
96+
echo "$(tput setaf 4) $(date): testing: ${case} $(tput sgr 0)"
8897

8998
CLIENT_LOG="$(mktemp)"
90-
if ! timeout 20 go run ./interop/client --use_tls --server_host_override=foo.test.google.fr --use_test_ca --test_case="${case}" &> $CLIENT_LOG; then
99+
if ! GRPC_GO_LOG_SEVERITY_LEVEL=info timeout 20 go run ./interop/client --use_tls --server_host_override=foo.test.google.fr --use_test_ca --test_case="${case}" &> $CLIENT_LOG; then
91100
fail "FAIL: test case ${case}
92101
got server log:
93102
$(cat $SERVER_LOG)
94103
got client log:
95104
$(cat $CLIENT_LOG)
96105
"
97106
else
98-
pass "PASS: test case ${case}"
107+
pass "PASS: test case ${case}"
99108
fi
100109
done
101110

interop/server/server.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ func main() {
5555
if err != nil {
5656
logger.Fatalf("failed to listen: %v", err)
5757
}
58+
logger.Infof("interop server listening on %v", lis.Addr())
5859
var opts []grpc.ServerOption
5960
if *useTLS {
6061
if *certFile == "" {

0 commit comments

Comments
 (0)