zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-08-05 01:11:50 +02:00
Code Issues Projects Releases Packages Wiki Activity

Chain ICANN report upload after staging

Browse source 
This converts the upload task from a cron job to a task chained after staging.
This ensures the upload job only occurs when its dependencies are met, and
provides a faster turnaround time to verify both the staging and upload jobs
are complete.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=175045489
This commit is contained in:
larryruili 2017-11-08 12:23:15 -08:00 • committed by jianglai
parent a6f0ab1429
commit 8dcc2d6833
3 changed files with 43 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
javatests/google/registry/reporting/IcannReportingStagingActionTest.java
View file

@ -16,6 +16,8 @@ package google.registry.reporting;
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
import static google.registry.testing.TaskQueueHelper.assertNoTasksEnqueued;
import static google.registry.testing.TaskQueueHelper.assertTasksEnqueued;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@ -28,7 +30,9 @@ import google.registry.testing.AppEngineRule;
import google.registry.testing.FakeClock;
import google.registry.testing.FakeResponse;
import google.registry.testing.FakeSleeper;
import google.registry.testing.TaskQueueHelper.TaskMatcher;
import google.registry.util.Retrier;
import org.joda.time.YearMonth;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@ -49,6 +53,7 @@ public class IcannReportingStagingActionTest {
public final AppEngineRule appEngine = AppEngineRule.builder()
.withDatastore()
.withLocalModules()
.withTaskQueue()
.build();
@Before
@ -57,8 +62,20 @@ public class IcannReportingStagingActionTest {
when(stager.stageReports(ReportType.TRANSACTIONS)).thenReturn(ImmutableList.of("c", "d"));
}
private static void assertUploadTaskEnqueued(String yearMonth, String subDir) throws Exception {
TaskMatcher matcher =
new TaskMatcher()
.url("/_dr/task/icannReportingUpload")
.method("POST")
.param("yearMonth", yearMonth)
.param("subdir", subDir);
assertTasksEnqueued("retryable-cron-tasks", matcher);
}
private IcannReportingStagingAction createAction(ImmutableList<ReportType> reportingMode) {
IcannReportingStagingAction action = new IcannReportingStagingAction();
action.yearMonth = new YearMonth(2017, 6);
action.subdir = "default/dir";
action.reportTypes = reportingMode;
action.response = response;
action.stager = stager;
@ -77,6 +94,7 @@ public class IcannReportingStagingActionTest {
.emailResults(
"ICANN Monthly report staging summary [SUCCESS]",
"Completed staging the following 2 ICANN reports:\na\nb");
assertUploadTaskEnqueued("2017-06", "default/dir");
}
@Test
@ -91,6 +109,7 @@ public class IcannReportingStagingActionTest {
.emailResults(
"ICANN Monthly report staging summary [SUCCESS]",
"Completed staging the following 4 ICANN reports:\na\nb\nc\nd");
assertUploadTaskEnqueued("2017-06", "default/dir");
}
@Test
@ -108,6 +127,7 @@ public class IcannReportingStagingActionTest {
.emailResults(
"ICANN Monthly report staging summary [SUCCESS]",
"Completed staging the following 4 ICANN reports:\na\nb\nc\nd");
assertUploadTaskEnqueued("2017-06", "default/dir");
}
@Test
@ -129,5 +149,7 @@ public class IcannReportingStagingActionTest {
"ICANN Monthly report staging summary [FAILURE]",
"Staging failed due to BigqueryJobFailureException: Expected failure,"
+ " check logs for more details.");
// Assert no upload task enqueued
assertNoTasksEnqueued("retryable-cron-tasks");
}
}