zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-06-24 21:40:57 +02:00
Code Issues Projects Releases Packages Wiki Activity

Restore a fix for flaky test (#1154)

Browse source 
* Restore a fix for flaky test

Restore a speculative fix for the flakiness in
DeleteExpiredDomainsActionTest. Although we identified a bug and fixed
it in a previous commit, it may not be the only bug. The removed fix may
still be necessary.
This commit is contained in:
Weimin Yu 2021-05-12 16:03:42 -04:00 • committed by GitHub
parent d0ba4477dd
commit c11f715157
1 changed files with 24 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

24
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;
@ -127,6 +128,29 @@ class DeleteExpiredDomainsActionTest {
DomainBase domain2 = persistNonAutorenewingDomain("veee2.tld"); DomainBase domain2 = persistNonAutorenewingDomain("veee2.tld");
DomainBase domain3 = persistNonAutorenewingDomain("tarm3.tld"); DomainBase domain3 = persistNonAutorenewingDomain("tarm3.tld");
// action.run() executes an ancestor-less query which is subject to eventual consistency (it
// uses an index that is updated asynchronously). For a deterministic test outcome, we busy
// wait here to give the data time to converge.
int maxRetries = 5;
while (true) {
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;
}
if (maxRetries-- <= 0) {
throw new RuntimeException("Eventual consistency does not converge in time for this test.");
}
Thread.sleep(200);
}
// action.run does multiple write transactions. We cannot emulate the behavior by manually // action.run does multiple write transactions. We cannot emulate the behavior by manually
// advancing the clock. Auto-increment to avoid timestamp inversion. // advancing the clock. Auto-increment to avoid timestamp inversion.
clock.setAutoIncrementByOneMilli(); clock.setAutoIncrementByOneMilli();