Skip to content

Commit 1eb5a31

Browse files
authored
chore: unflake asyncTransactionManagerWaitsUntilAsyncBatchUpdateHasFinished (#3258)
Fixes #3241
1 parent a843317 commit 1eb5a31

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

google-cloud-spanner/src/test/java/com/google/cloud/spanner/AsyncTransactionManagerTest.java

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
import com.google.common.collect.Range;
4747
import com.google.common.util.concurrent.MoreExecutors;
4848
import com.google.protobuf.AbstractMessage;
49+
import com.google.protobuf.GeneratedMessageV3;
4950
import com.google.spanner.v1.BatchCreateSessionsRequest;
5051
import com.google.spanner.v1.BeginTransactionRequest;
5152
import com.google.spanner.v1.CommitRequest;
@@ -983,17 +984,13 @@ public void asyncTransactionManagerWaitsUntilAsyncBatchUpdateHasFinished() throw
983984
}
984985
}
985986
}
987+
ImmutableList<Class<? extends GeneratedMessageV3>> expectedRequests =
988+
ImmutableList.of(
989+
BatchCreateSessionsRequest.class, ExecuteBatchDmlRequest.class, CommitRequest.class);
986990
if (isMultiplexedSessionsEnabled()) {
987-
assertThat(mockSpanner.getRequestTypes())
988-
.containsExactly(
989-
CreateSessionRequest.class,
990-
BatchCreateSessionsRequest.class,
991-
ExecuteBatchDmlRequest.class,
992-
CommitRequest.class);
991+
assertThat(mockSpanner.getRequestTypes()).containsAtLeastElementsIn(expectedRequests);
993992
} else {
994-
assertThat(mockSpanner.getRequestTypes())
995-
.containsExactly(
996-
BatchCreateSessionsRequest.class, ExecuteBatchDmlRequest.class, CommitRequest.class);
993+
assertThat(mockSpanner.getRequestTypes()).containsExactlyElementsIn(expectedRequests);
997994
}
998995
}
999996

0 commit comments

Comments
 (0)