diff options
| -rw-r--r-- | ravenwood/junit-src/android/platform/test/ravenwood/RavenwoodRule.java | 5 | ||||
| -rw-r--r-- | ravenwood/minimum-test/test/com/android/ravenwood/RavenwoodMinimumTest.java | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/ravenwood/junit-src/android/platform/test/ravenwood/RavenwoodRule.java b/ravenwood/junit-src/android/platform/test/ravenwood/RavenwoodRule.java index 513c09587026..d96787480cfa 100644 --- a/ravenwood/junit-src/android/platform/test/ravenwood/RavenwoodRule.java +++ b/ravenwood/junit-src/android/platform/test/ravenwood/RavenwoodRule.java @@ -142,6 +142,11 @@ public class RavenwoodRule implements TestRule { Assume.assumeFalse(IS_UNDER_RAVENWOOD); } + // Stopgap for http://g/ravenwood/EPAD-N5ntxM + if (description.getMethodName().endsWith("$noRavenwood")) { + Assume.assumeFalse(IS_UNDER_RAVENWOOD); + } + RavenwoodRuleImpl.init(RavenwoodRule.this); try { base.evaluate(); diff --git a/ravenwood/minimum-test/test/com/android/ravenwood/RavenwoodMinimumTest.java b/ravenwood/minimum-test/test/com/android/ravenwood/RavenwoodMinimumTest.java index 085c18622885..7abfecf0e424 100644 --- a/ravenwood/minimum-test/test/com/android/ravenwood/RavenwoodMinimumTest.java +++ b/ravenwood/minimum-test/test/com/android/ravenwood/RavenwoodMinimumTest.java @@ -42,4 +42,9 @@ public class RavenwoodMinimumTest { public void testIgnored() { throw new RuntimeException("Shouldn't be executed under ravenwood"); } + + @Test + public void testIgnored$noRavenwood() { + throw new RuntimeException("Shouldn't be executed under ravenwood"); + } } |