summaryrefslogtreecommitdiffstats
path: root/mojo/android/javatests/src
diff options
context:
space:
mode:
authorqyearsley <qyearsley@chromium.org>2014-10-23 16:18:34 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-23 23:18:46 +0000
commitf721f4e611aa43bd116a6d69fc58144b0d7b1628 (patch)
treef051cadbf94d73c16d302c6a56e54382cee6c00e /mojo/android/javatests/src
parent11d5f564c7bc634967edf4b06c801d46cfa399f5 (diff)
downloadchromium_src-f721f4e611aa43bd116a6d69fc58144b0d7b1628.zip
chromium_src-f721f4e611aa43bd116a6d69fc58144b0d7b1628.tar.gz
chromium_src-f721f4e611aa43bd116a6d69fc58144b0d7b1628.tar.bz2
Disable testConformance in response to test failure (second try)
First try was https://codereview.chromium.org/676893002/; I forgot to add an import statement. BUG=426564 Review URL: https://codereview.chromium.org/668343006 Cr-Commit-Position: refs/heads/master@{#300974}
Diffstat (limited to 'mojo/android/javatests/src')
-rw-r--r--mojo/android/javatests/src/org/chromium/mojo/bindings/ValidationTest.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/mojo/android/javatests/src/org/chromium/mojo/bindings/ValidationTest.java b/mojo/android/javatests/src/org/chromium/mojo/bindings/ValidationTest.java
index 8bf5e21..3734a7e4 100644
--- a/mojo/android/javatests/src/org/chromium/mojo/bindings/ValidationTest.java
+++ b/mojo/android/javatests/src/org/chromium/mojo/bindings/ValidationTest.java
@@ -7,6 +7,7 @@ package org.chromium.mojo.bindings;
import android.test.suitebuilder.annotation.SmallTest;
import android.util.Log;
+import org.chromium.base.test.util.DisabledTest;
import org.chromium.base.test.util.UrlUtils;
import org.chromium.mojo.HandleMock;
import org.chromium.mojo.MojoTestCase;
@@ -176,8 +177,9 @@ public class ValidationTest extends MojoTestCase {
/**
* Testing the conformance suite.
+ * Disabled: http://crbug.com/426564
*/
- @SmallTest
+ @DisabledTest
public void testConformance() throws FileNotFoundException {
runTest("conformance_", ConformanceTestInterface.MANAGER.buildStub(null,
ConformanceTestInterface.MANAGER.buildProxy(null, new SinkMessageReceiver())));