From c146253bbb286e0a049e59220f3ac253f6377aac Mon Sep 17 00:00:00 2001 From: Thiago Nunes Date: Wed, 23 Sep 2020 15:09:16 +1000 Subject: [PATCH] fix: disables pitr-lite tests in emulator The feature is not supported in the emulator currently. --- .../google/cloud/spanner/it/ITPitrCreateDatabaseTest.java | 8 ++++++++ .../google/cloud/spanner/it/ITPitrUpdateDatabaseTest.java | 8 +++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITPitrCreateDatabaseTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITPitrCreateDatabaseTest.java index 11676e891bb..f9fa081e413 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITPitrCreateDatabaseTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITPitrCreateDatabaseTest.java @@ -16,8 +16,10 @@ package com.google.cloud.spanner.it; +import static com.google.cloud.spanner.testing.EmulatorSpannerHelper.isUsingEmulator; import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.fail; +import static org.junit.Assume.assumeFalse; import com.google.cloud.spanner.Database; import com.google.cloud.spanner.DatabaseAdminClient; @@ -34,6 +36,7 @@ import java.util.concurrent.TimeUnit; import org.junit.After; import org.junit.Before; +import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -53,6 +56,11 @@ public class ITPitrCreateDatabaseTest { private DatabaseAdminClient dbAdminClient; private List databasesToDrop; + @BeforeClass + public static void doNotRunOnEmulator() { + assumeFalse("PITR-lite features are not supported by the emulator", isUsingEmulator()); + } + @Before public void setUp() { testHelper = env.getTestHelper(); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITPitrUpdateDatabaseTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITPitrUpdateDatabaseTest.java index a651ea89bf6..e4130fe67ad 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITPitrUpdateDatabaseTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITPitrUpdateDatabaseTest.java @@ -16,8 +16,10 @@ package com.google.cloud.spanner.it; +import static com.google.cloud.spanner.testing.EmulatorSpannerHelper.isUsingEmulator; import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.fail; +import static org.junit.Assume.assumeFalse; import com.google.api.gax.paging.Page; import com.google.cloud.spanner.Database; @@ -58,6 +60,8 @@ public class ITPitrUpdateDatabaseTest { @BeforeClass public static void setUp() throws Exception { + assumeFalse("PITR-lite features are not supported by the emulator", isUsingEmulator()); + final RemoteSpannerHelper testHelper = env.getTestHelper(); final String projectId = testHelper.getOptions().getProjectId(); instanceId = testHelper.getInstanceId().getInstance(); @@ -73,7 +77,9 @@ public static void setUp() throws Exception { @AfterClass public static void tearDown() { - dbAdminClient.dropDatabase(instanceId, databaseId); + if (!isUsingEmulator()) { + dbAdminClient.dropDatabase(instanceId, databaseId); + } } @Test