From 92fa0d67818ad45a1dbc2ef028d44b28ed01f4ac Mon Sep 17 00:00:00 2001 From: Ben McIlwain Date: Fri, 5 Aug 2016 14:29:13 -0700 Subject: [PATCH] Reduce mapreduce shards in tests This fixes a significant memory consumption issue when running tests. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=129482832 --- .../billing/ExpandRecurringBillingEventsActionTest.java | 2 +- .../registry/flows/async/DeleteEppResourceActionTestCase.java | 2 +- .../registry/flows/async/DnsRefreshForHostRenameActionTest.java | 2 +- .../registry/tools/server/DeleteProberDataActionTest.java | 2 +- .../registry/tools/server/ResaveAllEppResourcesActionTest.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/javatests/google/registry/billing/ExpandRecurringBillingEventsActionTest.java b/javatests/google/registry/billing/ExpandRecurringBillingEventsActionTest.java index 91e2dd4de..b3324652e 100644 --- a/javatests/google/registry/billing/ExpandRecurringBillingEventsActionTest.java +++ b/javatests/google/registry/billing/ExpandRecurringBillingEventsActionTest.java @@ -71,7 +71,7 @@ public class ExpandRecurringBillingEventsActionTest @Before public void init() { action = new ExpandRecurringBillingEventsAction(); - action.mrRunner = new MapreduceRunner(Optional.absent(), Optional.absent()); + action.mrRunner = new MapreduceRunner(Optional.of(5), Optional.absent()); action.clock = clock; action.cursorTimeParam = Optional.absent(); createTld("tld"); diff --git a/javatests/google/registry/flows/async/DeleteEppResourceActionTestCase.java b/javatests/google/registry/flows/async/DeleteEppResourceActionTestCase.java index ababd3378..b0d956348 100644 --- a/javatests/google/registry/flows/async/DeleteEppResourceActionTestCase.java +++ b/javatests/google/registry/flows/async/DeleteEppResourceActionTestCase.java @@ -71,7 +71,7 @@ public abstract class DeleteEppResourceActionTestCaseabsent(), Optional.absent()); + action.mrRunner = new MapreduceRunner(Optional.of(5), Optional.absent()); action.response = new FakeResponse(); action.clock = clock; inject.setStaticField(Ofy.class, "clock", clock); diff --git a/javatests/google/registry/flows/async/DnsRefreshForHostRenameActionTest.java b/javatests/google/registry/flows/async/DnsRefreshForHostRenameActionTest.java index 454886a83..47d6159d2 100644 --- a/javatests/google/registry/flows/async/DnsRefreshForHostRenameActionTest.java +++ b/javatests/google/registry/flows/async/DnsRefreshForHostRenameActionTest.java @@ -65,7 +65,7 @@ public class DnsRefreshForHostRenameActionTest private void runMapreduce(String hostKeyString) throws Exception { action = new DnsRefreshForHostRenameAction(); action.hostKeyString = hostKeyString; - action.mrRunner = new MapreduceRunner(Optional.absent(), Optional.absent()); + action.mrRunner = new MapreduceRunner(Optional.of(5), Optional.absent()); action.response = new FakeResponse(); action.run(); executeTasksUntilEmpty("mapreduce"); diff --git a/javatests/google/registry/tools/server/DeleteProberDataActionTest.java b/javatests/google/registry/tools/server/DeleteProberDataActionTest.java index 888fe2102..6150d0af5 100644 --- a/javatests/google/registry/tools/server/DeleteProberDataActionTest.java +++ b/javatests/google/registry/tools/server/DeleteProberDataActionTest.java @@ -74,7 +74,7 @@ public class DeleteProberDataActionTest extends MapreduceTestCaseabsent(), Optional.absent()); + action.mrRunner = new MapreduceRunner(Optional.of(5), Optional.absent()); action.response = new FakeResponse(); action.isDryRun = false; } diff --git a/javatests/google/registry/tools/server/ResaveAllEppResourcesActionTest.java b/javatests/google/registry/tools/server/ResaveAllEppResourcesActionTest.java index 1e039847a..e3de78f07 100644 --- a/javatests/google/registry/tools/server/ResaveAllEppResourcesActionTest.java +++ b/javatests/google/registry/tools/server/ResaveAllEppResourcesActionTest.java @@ -37,7 +37,7 @@ public class ResaveAllEppResourcesActionTest @Before public void init() { action = new ResaveAllEppResourcesAction(); - action.mrRunner = new MapreduceRunner(Optional.absent(), Optional.absent()); + action.mrRunner = new MapreduceRunner(Optional.of(5), Optional.absent()); action.response = new FakeResponse(); }