test: fix tests for headers and trailers (googleapis#1500)

* test: fix tests for headers and trailers * Echo headers and trailers when the stream ends
renovate-bot · Apr 15, 2024 · 9fa1452 · 9fa1452
1 parent 961e217
commit 9fa1452
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/server/services/echo_service.go b/server/services/echo_service.go
@@ -141,6 +141,8 @@ func (s *echoServerImpl) Chat(stream pb.Echo_ChatServer) error {
 	for {
 		req, err := stream.Recv()
 		if err == io.EOF {
+			// Echo headers and trailers when the stream ends
+			echoStreamingHeaders(stream)
 			echoStreamingTrailers(stream)
 			return nil
 		}
@@ -152,7 +154,6 @@ func (s *echoServerImpl) Chat(stream pb.Echo_ChatServer) error {
 		if s != nil {
 			return s
 		}
-		echoStreamingHeaders(stream)
 		stream.Send(&pb.EchoResponse{Content: req.GetContent()})
 	}
 }

diff --git a/server/services/echo_service_test.go b/server/services/echo_service_test.go
@@ -122,7 +122,7 @@ func (m *mockUnaryStream) SetHeader(md metadata.MD) error {
 	return nil
 }
 func (m *mockUnaryStream) verify(expectHeadersAndTrailers bool) {
-	if expectHeadersAndTrailers && !reflect.DeepEqual([]string{"show", "case"}, m.trail) && !reflect.DeepEqual([]string{"showcaseHeader, anotherHeader"}, m.head) {
+	if expectHeadersAndTrailers && (!reflect.DeepEqual([]string{"show", "case"}, m.trail) || !reflect.DeepEqual([]string{"showcaseHeader", "anotherHeader"}, m.head)) {
 		m.t.Errorf("Unary stream did not get all expected headers and trailers.\nGot these headers: %+v\nGot these trailers: %+v", m.head, m.trail)
 	}
 }
@@ -160,7 +160,7 @@ func (m *mockExpandStream) verify(expectHeadersAndTrailers bool) {
 	if len(m.exp) > 0 {
 		m.t.Errorf("Expand did not stream all expected values. %d expected values remaining.", len(m.exp))
 	}
-	if expectHeadersAndTrailers && !reflect.DeepEqual([]string{"show", "case"}, m.trail) && !reflect.DeepEqual([]string{"showcaseHeader", "anotherHeader"}, m.head) {
+	if expectHeadersAndTrailers && (!reflect.DeepEqual([]string{"show", "case"}, m.trail) || !reflect.DeepEqual([]string{"showcaseHeader", "anotherHeader"}, m.head)) {
 		m.t.Errorf("Expand did not get all expected headers and trailers.\nGot these headers: %+v\nGot these trailers: %+v", m.head, m.trail)
 	}
 }
@@ -266,7 +266,7 @@ func (m *mockCollectStream) SetTrailer(md metadata.MD) {
 }
 
 func (m *mockCollectStream) verify(expectHeadersAndTrailers bool) {
-	if expectHeadersAndTrailers && !reflect.DeepEqual([]string{"show", "case"}, m.trail) && !reflect.DeepEqual([]string{"showcaseHeader", "anotherHeader"}, m.head) {
+	if expectHeadersAndTrailers && (!reflect.DeepEqual([]string{"show", "case"}, m.trail) || !reflect.DeepEqual([]string{"showcaseHeader", "anotherHeader"}, m.head)) {
 		m.t.Errorf("Collect did not get all expected trailers.\nGot these headers: %+v\nGot these trailers: %+v", m.head, m.trail)
 	}
 }
@@ -367,7 +367,7 @@ func (m *mockChatStream) SetTrailer(md metadata.MD) {
 }
 
 func (m *mockChatStream) verify(expectHeadersAndTrailers bool) {
-	if expectHeadersAndTrailers && !reflect.DeepEqual([]string{"show", "case"}, m.trail) && !reflect.DeepEqual([]string{"showcaseHeader", "anotherHeader"}, m.head) {
+	if expectHeadersAndTrailers && (!reflect.DeepEqual([]string{"show", "case"}, m.trail) || !reflect.DeepEqual([]string{"showcaseHeader", "anotherHeader"}, m.head)) {
 		m.t.Errorf("Chat did not get all expected trailers.\nGot these headers: %+v\nGot these trailers: %+v", m.head, m.trail)
 	}
 }

diff --git a/server/services/sequence_service_test.go b/server/services/sequence_service_test.go
@@ -252,7 +252,7 @@ func (m *mockStreamSequence) verify(expectHeadersAndTrailers bool) {
 	if len(m.exp) > 0 {
 		m.t.Errorf("Expand did not stream all expected values. %d expected values remaining.", len(m.exp))
 	}
-	if expectHeadersAndTrailers && !reflect.DeepEqual([]string{"show", "case"}, m.trail) && !reflect.DeepEqual([]string{"showcaseHeader", "anotherHeader"}, m.head) {
+	if expectHeadersAndTrailers && (!reflect.DeepEqual([]string{"show", "case"}, m.trail) || !reflect.DeepEqual([]string{"showcaseHeader", "anotherHeader"}, m.head)) {
 		m.t.Errorf("Expand did not get all expected headers and trailers.\nGot these headers: %+v\nGot these trailers: %+v", m.head, m.trail)
 	}
 }