Skip to content

test: Fix ordered publish failure test by forcing scheduled work to be done #2025

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

test: Fix ordered publish failure test by forcing scheduled work to be done #2025

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cd50315
test: Fix ordered publish failure test by forcing scheduled work to b…
michaelpri10 May 13, 2024
759424f
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] May 14, 2024
2581a7a
test: Advance the executor by 5 seconds in the ordering publish failu…
michaelpri10 May 14, 2024
0b85a3c
test: Change advance duration back to zero
michaelpri10 May 14, 2024
e58cad4
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] May 20, 2024
ec20b65
Merge branch 'main' into test-fix
michaelpri10 May 20, 2024
6cea15e
Merge branch 'main' into test-fix
michaelpri10 Jul 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/PublisherImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,9 +511,6 @@ public void testEnableMessageOrdering_overwritesMaxAttempts() throws Exception {
* <li>publish with key orderA, which should now succeed
* </ol>
*/
/*
Temporarily disabled due to https://github.com/googleapis/java-pubsub/issues/1861.
TODO(maitrimangal): Enable once resolved.
@Test
public void testResumePublish() throws Exception {
Publisher publisher =
Expand Down Expand Up @@ -575,8 +572,8 @@ public void testResumePublish() throws Exception {
testPublisherServiceImpl.addPublishResponse(
PublishResponse.newBuilder().addMessageIds("5").addMessageIds("6"));

Assert.assertEquals("5", future5.get());
Assert.assertEquals("6", future6.get());
assertEquals("5", future5.get());
assertEquals("6", future6.get());

// Resume publishing of "orderA", which should now succeed
publisher.resumePublish("orderA");
Expand All @@ -587,8 +584,8 @@ public void testResumePublish() throws Exception {
testPublisherServiceImpl.addPublishResponse(
PublishResponse.newBuilder().addMessageIds("7").addMessageIds("8"));

Assert.assertEquals("7", future7.get());
Assert.assertEquals("8", future8.get());
assertEquals("7", future7.get());
assertEquals("8", future8.get());

shutdownTestPublisher(publisher);
}
Expand Down Expand Up @@ -633,6 +630,7 @@ public void testPublishThrowExceptionForUnsubmittedOrderingKeyMessage() throws E
} catch (ExecutionException e) {
assertEquals(SequentialExecutorService.CallbackExecutor.CANCELLATION_EXCEPTION, e.getCause());
}
fakeExecutor.advanceTime(Duration.ZERO);

// A subsequent attempt fails immediately.
ApiFuture<String> publishFuture4 = sendTestMessageWithOrderingKey(publisher, "D", "a");
Expand All @@ -643,7 +641,6 @@ public void testPublishThrowExceptionForUnsubmittedOrderingKeyMessage() throws E
assertEquals(SequentialExecutorService.CallbackExecutor.CANCELLATION_EXCEPTION, e.getCause());
}
}
*/

private ApiFuture<String> sendTestMessageWithOrderingKey(
Publisher publisher, String data, String orderingKey) {
Expand Down