Revert test size change in ExpandRecurringBillingEventsActionTest

Also adding some temporary logging to the test class in order to diagnose some mysterious behavior on Kokoro. I'll back this out once I get a test run to fail.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=140482533
This commit is contained in:
ctingue 2016-11-29 08:34:15 -08:00 committed by Ben McIlwain
parent 8a8276e838
commit 6373784858
2 changed files with 10 additions and 2 deletions

View file

@ -39,7 +39,7 @@ java_library(
GenTestRules( GenTestRules(
name = "GeneratedTestRules", name = "GeneratedTestRules",
default_test_size = "large", default_test_size = "medium",
shard_count = 4, shard_count = 4,
test_files = glob(["*Test.java"]), test_files = glob(["*Test.java"]),
deps = [":batch"], deps = [":batch"],

View file

@ -44,6 +44,7 @@ import google.registry.testing.ExceptionRule;
import google.registry.testing.FakeClock; import google.registry.testing.FakeClock;
import google.registry.testing.FakeResponse; import google.registry.testing.FakeResponse;
import google.registry.testing.mapreduce.MapreduceTestCase; import google.registry.testing.mapreduce.MapreduceTestCase;
import google.registry.util.FormattingLogger;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.joda.money.Money; import org.joda.money.Money;
@ -51,11 +52,12 @@ import org.joda.time.DateTime;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.rules.TestName;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.JUnit4; import org.junit.runners.JUnit4;
/** Unit tests for {@link ExpandRecurringBillingEventsAction}. */ /** Unit tests for {@link ExpandRecurringBillingEventsAction}. */
// The logger in this class is temporary, necessary for diagnosing some odd test failure behavior.
@RunWith(JUnit4.class) @RunWith(JUnit4.class)
public class ExpandRecurringBillingEventsActionTest public class ExpandRecurringBillingEventsActionTest
extends MapreduceTestCase<ExpandRecurringBillingEventsAction> { extends MapreduceTestCase<ExpandRecurringBillingEventsAction> {
@ -63,6 +65,11 @@ public class ExpandRecurringBillingEventsActionTest
@Rule @Rule
public final ExceptionRule thrown = new ExceptionRule(); public final ExceptionRule thrown = new ExceptionRule();
@Rule
public TestName testName = new TestName();
private static final FormattingLogger logger = FormattingLogger.getLoggerForCallerClass();
final FakeClock clock = new FakeClock(DateTime.parse("2000-10-02T00:00:00Z")); final FakeClock clock = new FakeClock(DateTime.parse("2000-10-02T00:00:00Z"));
DomainResource domain; DomainResource domain;
@ -71,6 +78,7 @@ public class ExpandRecurringBillingEventsActionTest
@Before @Before
public void init() { public void init() {
logger.infofmt("Running test %s", testName.getMethodName());
action = new ExpandRecurringBillingEventsAction(); action = new ExpandRecurringBillingEventsAction();
action.mrRunner = makeDefaultRunner(); action.mrRunner = makeDefaultRunner();
action.clock = clock; action.clock = clock;