Skip to content
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

test: ignore if the mock server failed to return a row #3335

Merged
merged 1 commit into from
Sep 17, 2024
Merged

test: ignore if the mock server failed to return a row #3335

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 26 additions & 2 deletions ...oud-spanner/src/test/java/com/google/cloud/spanner/CloseSpannerWithOpenResultSetTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
Expand All @@ -59,6 +61,16 @@ Spanner createSpanner() {
.getService();
}

@BeforeClass
public static void setWatchdogTimeout() {
System.setProperty("com.google.cloud.spanner.watchdogTimeoutSeconds", "1");
}

@AfterClass
public static void clearWatchdogTimeout() {
System.clearProperty("com.google.cloud.spanner.watchdogTimeoutSeconds");
}

@After
public void cleanup() {
mockSpanner.unfreeze();
Expand All @@ -75,7 +87,13 @@ public void testBatchClient_closedSpannerWithOpenResultSet_streamsAreCancelled()
client.batchReadOnlyTransaction(TimestampBound.strong());
ResultSet resultSet = transaction.executeQuery(SELECT_RANDOM_STATEMENT)) {
mockSpanner.freezeAfterReturningNumRows(1);
assertTrue(resultSet.next());
// This can sometimes fail, as the mock server may not always actually return the first row.
try {
assertTrue(resultSet.next());
} catch (SpannerException exception) {
assertEquals(ErrorCode.DEADLINE_EXCEEDED, exception.getErrorCode());
return;
}
((SpannerImpl) spanner).close(1, TimeUnit.MILLISECONDS);
// This should return an error as the stream is cancelled.
SpannerException exception = assertThrows(SpannerException.class, resultSet::next);
Expand All @@ -93,7 +111,13 @@ public void testNormalDatabaseClient_closedSpannerWithOpenResultSet_sessionsAreD
try (ReadOnlyTransaction transaction = client.readOnlyTransaction(TimestampBound.strong());
ResultSet resultSet = transaction.executeQuery(SELECT_RANDOM_STATEMENT)) {
mockSpanner.freezeAfterReturningNumRows(1);
assertTrue(resultSet.next());
// This can sometimes fail, as the mock server may not always actually return the first row.
try {
assertTrue(resultSet.next());
} catch (SpannerException exception) {
assertEquals(ErrorCode.DEADLINE_EXCEEDED, exception.getErrorCode());
return;
}
List<ExecuteSqlRequest> executeSqlRequests =
mockSpanner.getRequestsOfType(ExecuteSqlRequest.class).stream()
.filter(request -> request.getSql().equals(SELECT_RANDOM_STATEMENT.getSql()))
Expand Down
Loading