zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-07-05 10:43:26 +02:00
Code Issues Projects Releases Packages Wiki Activity

Try again to fix a flaky test (#1066)

Browse source 
* Try again to fix a flaky test

Fix DeleteExpiredDomainsActionTest.test_deletesThreeDomainsInOneRun
This commit is contained in:
Weimin Yu 2021-04-08 11:47:35 -04:00 • committed by GitHub
parent 0b520f3885
commit 0156a29f93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

25
core/src/test/java/google/registry/batch/DeleteExpiredDomainsActionTest.java
View file

@ -16,6 +16,7 @@ package google.registry.batch;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static google.registry.model.eppcommon.StatusValue.PENDING_DELETE; import static google.registry.model.eppcommon.StatusValue.PENDING_DELETE;
import static google.registry.model.ofy.ObjectifyService.ofy;
import static google.registry.model.reporting.HistoryEntry.Type.DOMAIN_CREATE; import static google.registry.model.reporting.HistoryEntry.Type.DOMAIN_CREATE;
import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
import static google.registry.testing.DatabaseHelper.createTld; import static google.registry.testing.DatabaseHelper.createTld;
@ -121,14 +122,30 @@ class DeleteExpiredDomainsActionTest {
} }
@Test @Test
void test_deletesThreeDomainsInOneRun() { void test_deletesThreeDomainsInOneRun() throws Exception {
DomainBase domain1 = persistNonAutorenewingDomain("ecck1.tld"); DomainBase domain1 = persistNonAutorenewingDomain("ecck1.tld");
DomainBase domain2 = persistNonAutorenewingDomain("veee2.tld"); DomainBase domain2 = persistNonAutorenewingDomain("veee2.tld");
DomainBase domain3 = persistNonAutorenewingDomain("tarm3.tld"); DomainBase domain3 = persistNonAutorenewingDomain("tarm3.tld");
// action.run() executes a non-transactional query by design but makes this test flaky. // action.run() executes an ancestor-less query which is subject to eventual consistency (it
// Executing a transaction here seems to force the test Datastore to become up to date. // uses an index that is updated asynchronously). For a deterministic test outcome, we busy
assertThat(tm().loadByEntity(domain3).getStatusValues()).doesNotContain(PENDING_DELETE); // wait here until all domains above are returned by the query.
for (int attempts = 0; attempts < 3; attempts++) {
ImmutableSet<String> matchingDomains =
ofy()
.load()
.type(DomainBase.class)
.filter("autorenewEndTime <=", clock.nowUtc())
.list()
.stream()
.map(DomainBase::getDomainName)
.collect(ImmutableSet.toImmutableSet());
if (matchingDomains.containsAll(ImmutableSet.of("ecck1.tld", "veee2.tld", "tarm3.tld"))) {
break;
}
Thread.sleep(100);
}
action.run(); action.run();
assertThat(tm().loadByEntity(domain1).getStatusValues()).contains(PENDING_DELETE); assertThat(tm().loadByEntity(domain1).getStatusValues()).contains(PENDING_DELETE);