Skip to content

Commit 628933a

Browse files
committed
itest: update expected errors
1 parent 25332b6 commit 628933a

File tree

2 files changed

+11
-20
lines changed

2 files changed

+11
-20
lines changed

itest/litd_mode_integrated_test.go

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -428,8 +428,7 @@ func integratedTestSuite(ctx context.Context, net *NetworkHarness, t *testing.T,
428428
endpoint.requestFn,
429429
endpoint.successPattern,
430430
endpointDisabled,
431-
"unknown permissions required for "+
432-
"method",
431+
"unknown gRPC web request",
433432
)
434433
})
435434
}
@@ -465,8 +464,7 @@ func integratedTestSuite(ctx context.Context, net *NetworkHarness, t *testing.T,
465464
shouldFailWithoutMacaroon,
466465
endpoint.successPattern,
467466
endpointDisabled,
468-
"unknown permissions required for "+
469-
"method",
467+
"unknown gRPC web request",
470468
)
471469
})
472470
}
@@ -491,8 +489,7 @@ func integratedTestSuite(ctx context.Context, net *NetworkHarness, t *testing.T,
491489
ttt, cfg.LitAddr(), cfg.UIPassword,
492490
endpoint.grpcWebURI,
493491
withoutUIPassword, endpointDisabled,
494-
"unknown permissions required for "+
495-
"method",
492+
"unknown gRPC web request",
496493
)
497494
})
498495
}
@@ -531,8 +528,7 @@ func integratedTestSuite(ctx context.Context, net *NetworkHarness, t *testing.T,
531528
endpoint.requestFn,
532529
endpoint.successPattern,
533530
endpointDisabled,
534-
"unknown permissions required for "+
535-
"method",
531+
"unknown gRPC web request",
536532
)
537533
})
538534
}
@@ -1071,8 +1067,8 @@ func runLNCAuthTest(t *testing.T, rawLNCConn grpc.ClientConnInterface,
10711067
// Is this a disallowed call?
10721068
if !callAllowed {
10731069
if disabled {
1074-
require.ErrorContains(t, err, "unknown permissions "+
1075-
"required for method")
1070+
require.ErrorContains(t, err, "unknown gRPC web "+
1071+
"request")
10761072
} else {
10771073
require.ErrorContains(t, err, expectErrContains)
10781074
}
@@ -1083,8 +1079,7 @@ func runLNCAuthTest(t *testing.T, rawLNCConn grpc.ClientConnInterface,
10831079
// The call should be allowed, so we expect no error unless this is
10841080
// for a disabled sub-server.
10851081
if disabled {
1086-
require.ErrorContains(t, err, "unknown permissions "+
1087-
"required for method")
1082+
require.ErrorContains(t, err, "unknown gRPC web request")
10881083

10891084
return
10901085
} else {

itest/litd_mode_remote_test.go

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@ func remoteTestSuite(ctx context.Context, net *NetworkHarness, t *testing.T,
6666
endpoint.requestFn,
6767
endpoint.successPattern,
6868
endpointEnabled,
69-
"unknown permissions required for "+
70-
"method",
69+
"unknown gRPC web request",
7170
)
7271
})
7372
}
@@ -93,8 +92,7 @@ func remoteTestSuite(ctx context.Context, net *NetworkHarness, t *testing.T,
9392
shouldFailWithoutMacaroon,
9493
endpoint.successPattern,
9594
endpointEnabled,
96-
"unknown permissions required for "+
97-
"method",
95+
"unknown gRPC web request",
9896
)
9997
})
10098
}
@@ -117,8 +115,7 @@ func remoteTestSuite(ctx context.Context, net *NetworkHarness, t *testing.T,
117115
ttt, cfg.LitAddr(), cfg.UIPassword,
118116
endpoint.grpcWebURI, withoutUIPassword,
119117
endpointEnabled,
120-
"unknown permissions required for "+
121-
"method",
118+
"unknown gRPC web request",
122119
)
123120
})
124121
}
@@ -146,8 +143,7 @@ func remoteTestSuite(ctx context.Context, net *NetworkHarness, t *testing.T,
146143
endpoint.requestFn,
147144
endpoint.successPattern,
148145
endpointEnabled,
149-
"unknown permissions required for "+
150-
"method",
146+
"unknown gRPC web request",
151147
)
152148
})
153149
}

0 commit comments

Comments
 (0)