| commit | 03ca1ca8749f810e132574e4fc7278bd420113b3 | [log] [tgz] |
|---|---|---|
| author | Christian Williams <christianw@google.com> | Wed Jul 06 11:56:58 2016 -0700 |
| committer | Christian Williams <christianw@google.com> | Wed Jul 06 15:27:31 2016 -0700 |
| tree | 5bb0c048871fe326af7d7d7a82a966ea6b41371d | |
| parent | e5ad7dc9a0d526cf19407dc7d9ebfd61af43d83b [diff] |
Re-enable jdk8 ci build, re-enable possible timebomb test.
diff --git a/.travis.yml b/.travis.yml index 04f2367..4024e28 100644 --- a/.travis.yml +++ b/.travis.yml
@@ -3,7 +3,7 @@ jdk: - oraclejdk7 -# - oraclejdk8 # todo: fixme + - oraclejdk8 cache: directories:
diff --git a/robolectric/src/test/java/org/robolectric/shadows/ShadowDateUtilsTest.java b/robolectric/src/test/java/org/robolectric/shadows/ShadowDateUtilsTest.java index 8875f39..40bbe0d 100644 --- a/robolectric/src/test/java/org/robolectric/shadows/ShadowDateUtilsTest.java +++ b/robolectric/src/test/java/org/robolectric/shadows/ShadowDateUtilsTest.java
@@ -30,7 +30,7 @@ assertThat(actual).isEqualTo("1/1"); } - @Ignore("for a moment") + @Test @Config(sdk = {Build.VERSION_CODES.M}) public void formatDateTime_withCurrentYear_worksSinceM() { Calendar calendar = Calendar.getInstance();