77 "testing"
88 "time"
99
10+ "github.com/stretchr/testify/assert"
11+ "github.com/stretchr/testify/require"
1012 gatewaypb "github.com/uber/submitqueue/gateway/protopb"
1113 orchestratorpb "github.com/uber/submitqueue/orchestrator/protopb"
1214 speculatorpb "github.com/uber/submitqueue/speculator/protopb"
@@ -27,68 +29,50 @@ func TestPingForAllServices(t *testing.T) {
2729 t .Run ("Gateway" , func (t * testing.T ) {
2830 addr := getEnvOrDefault ("GATEWAY_ADDR" , "localhost:8081" )
2931 conn , err := waitForServer (t , addr , serverReadyTimeout )
30- if err != nil {
31- t .Fatalf ("Gateway server not ready: %v" , err )
32- }
32+ require .NoError (t , err , "Gateway server not ready" )
3333 defer conn .Close ()
3434
3535 client := gatewaypb .NewSubmitQueueGatewayClient (conn )
3636 ctx , cancel := context .WithTimeout (context .Background (), defaultTimeout )
3737 defer cancel ()
3838
3939 resp , err := client .Ping (ctx , & gatewaypb.PingRequest {Message : "e2e test" })
40- if err != nil {
41- t .Fatalf ("Gateway Ping failed: %v" , err )
42- }
43- if resp .ServiceName != "gateway" {
44- t .Errorf ("Expected service name 'gateway', got '%s'" , resp .ServiceName )
45- }
40+ require .NoError (t , err , "Gateway Ping failed" )
41+ assert .Equal (t , "gateway" , resp .ServiceName )
4642 t .Logf ("Gateway is healthy: %s" , resp .Message )
4743 })
4844
4945 // Test Orchestrator
5046 t .Run ("Orchestrator" , func (t * testing.T ) {
5147 addr := getEnvOrDefault ("ORCHESTRATOR_ADDR" , "localhost:8082" )
5248 conn , err := waitForServer (t , addr , serverReadyTimeout )
53- if err != nil {
54- t .Fatalf ("Orchestrator server not ready: %v" , err )
55- }
49+ require .NoError (t , err , "Orchestrator server not ready" )
5650 defer conn .Close ()
5751
5852 client := orchestratorpb .NewSubmitQueueOrchestratorClient (conn )
5953 ctx , cancel := context .WithTimeout (context .Background (), defaultTimeout )
6054 defer cancel ()
6155
6256 resp , err := client .Ping (ctx , & orchestratorpb.PingRequest {Message : "e2e test" })
63- if err != nil {
64- t .Fatalf ("Orchestrator Ping failed: %v" , err )
65- }
66- if resp .ServiceName != "orchestrator" {
67- t .Errorf ("Expected service name 'orchestrator', got '%s'" , resp .ServiceName )
68- }
57+ require .NoError (t , err , "Orchestrator Ping failed" )
58+ assert .Equal (t , "orchestrator" , resp .ServiceName )
6959 t .Logf ("Orchestrator is healthy: %s" , resp .Message )
7060 })
7161
7262 // Test Speculator
7363 t .Run ("Speculator" , func (t * testing.T ) {
7464 addr := getEnvOrDefault ("SPECULATOR_ADDR" , "localhost:8083" )
7565 conn , err := waitForServer (t , addr , serverReadyTimeout )
76- if err != nil {
77- t .Fatalf ("Speculator server not ready: %v" , err )
78- }
66+ require .NoError (t , err , "Speculator server not ready" )
7967 defer conn .Close ()
8068
8169 client := speculatorpb .NewSubmitQueueSpeculatorClient (conn )
8270 ctx , cancel := context .WithTimeout (context .Background (), defaultTimeout )
8371 defer cancel ()
8472
8573 resp , err := client .Ping (ctx , & speculatorpb.PingRequest {Message : "e2e test" })
86- if err != nil {
87- t .Fatalf ("Speculator Ping failed: %v" , err )
88- }
89- if resp .ServiceName != "speculator" {
90- t .Errorf ("Expected service name 'speculator', got '%s'" , resp .ServiceName )
91- }
74+ require .NoError (t , err , "Speculator Ping failed" )
75+ assert .Equal (t , "speculator" , resp .ServiceName )
9276 t .Logf ("Speculator is healthy: %s" , resp .Message )
9377 })
9478
0 commit comments