zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-04-30 12:07:51 +02:00
Code Issues Projects Releases Packages Wiki Activity

Remove retries for DatabaseSnapshot tests (#1690)

Browse source 
* Remove retries for DatabaseSnapshot tests
This commit is contained in:
Weimin Yu 2022-06-29 14:45:41 -04:00 • committed by GitHub
parent 68470e5cdf
commit cd4770dd5b
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/src/test/java/google/registry/beam/common/DatabaseSnapshotTest.java
View file

@ -37,7 +37,6 @@ import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.extension.RegisterExtension;
import org.junitpioneer.jupiter.RetryingTest;
import org.testcontainers.containers.PostgreSQLContainer; import org.testcontainers.containers.PostgreSQLContainer;
import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers; import org.testcontainers.junit.jupiter.Testcontainers;
@ -47,8 +46,10 @@ import org.testcontainers.junit.jupiter.Testcontainers;
public class DatabaseSnapshotTest { public class DatabaseSnapshotTest {
/** /**
* For reasons unknown, an EntityManagerFactory created by {@code JpaIntegrationTestExtension} or * Directly start a PSQL database instead of going through the test extensions.
* {@code JpaUnitTestExtension} enters a bad state after exporting the first snapshot. Starting *
* <p>For reasons unknown, an EntityManagerFactory created by {@code JpaIntegrationTestExtension}
* or {@code JpaUnitTestExtension} enters a bad state after exporting the first snapshot. Starting
* with the second attempt, exports alternate between error ("cannot export a snapshot from a * with the second attempt, exports alternate between error ("cannot export a snapshot from a
* subtransaction") and success. The {@link #createSnapshot_twiceNoRead} test below fails with * subtransaction") and success. The {@link #createSnapshot_twiceNoRead} test below fails with
* either extension. EntityManagerFactory created for production does not have this problem. * either extension. EntityManagerFactory created for production does not have this problem.
@ -107,7 +108,7 @@ public class DatabaseSnapshotTest {
try (DatabaseSnapshot databaseSnapshot = DatabaseSnapshot.createSnapshot()) {} try (DatabaseSnapshot databaseSnapshot = DatabaseSnapshot.createSnapshot()) {}
} }
@RetryingTest(2) // TODO(b/226945065) revert to @Test when DatbaseMigrationSchedule is removed. @Test
void readSnapshot() { void readSnapshot() {
try (DatabaseSnapshot databaseSnapshot = DatabaseSnapshot.createSnapshot()) { try (DatabaseSnapshot databaseSnapshot = DatabaseSnapshot.createSnapshot()) {
Registry snapshotRegistry = Registry snapshotRegistry =
@ -121,7 +122,7 @@ public class DatabaseSnapshotTest {
} }
} }
@RetryingTest(2) // TODO(b/226945065) revert to @Test when DatbaseMigrationSchedule is removed. @Test
void readSnapshot_withSubsequentChange() { void readSnapshot_withSubsequentChange() {
try (DatabaseSnapshot databaseSnapshot = DatabaseSnapshot.createSnapshot()) { try (DatabaseSnapshot databaseSnapshot = DatabaseSnapshot.createSnapshot()) {
Registry updated = Registry updated =