Skip to content

Commit 6b647c7

Browse files
authored
Merge pull request #37692: Moves expectMessage to before creating BeamFnLoggingClient
2 parents e755b53 + 27a5fca commit 6b647c7

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

sdks/java/harness/src/test/java/org/apache/beam/fn/harness/logging/BeamFnLoggingClientTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,6 +532,7 @@ public StreamObserver<BeamFnApi.LogEntry.List> logging(
532532

533533
ManagedChannel channel = InProcessChannelBuilder.forName(apiServiceDescriptor.getUrl()).build();
534534
try {
535+
thrown.expectMessage("Logging stream terminated unexpectedly");
535536
BeamFnLoggingClient client =
536537
BeamFnLoggingClient.createAndStart(
537538
PipelineOptionsFactory.fromArgs(
@@ -543,7 +544,6 @@ public StreamObserver<BeamFnApi.LogEntry.List> logging(
543544
apiServiceDescriptor,
544545
(Endpoints.ApiServiceDescriptor descriptor) -> channel);
545546

546-
thrown.expectMessage("Logging stream terminated unexpectedly");
547547
client.terminationFuture().get();
548548
} finally {
549549
// Verify that after termination, log levels are reset.

0 commit comments

Comments
 (0)