summaryrefslogtreecommitdiffstats
path: root/mojo
diff options
context:
space:
mode:
authoravi <avi@chromium.org>2014-10-23 14:21:01 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-23 21:21:16 +0000
commit873246335d057971ef54fc7f45548bffa46b3da1 (patch)
tree2236c86832bf8330bd0a81e7abc2ad54d0847560 /mojo
parented4f7a78af68cd8dcfea63c899fbaf3dd27716e6 (diff)
downloadchromium_src-873246335d057971ef54fc7f45548bffa46b3da1.zip
chromium_src-873246335d057971ef54fc7f45548bffa46b3da1.tar.gz
chromium_src-873246335d057971ef54fc7f45548bffa46b3da1.tar.bz2
Revert of Disabling testConformance in response to test failure (patchset #1 id:1 of https://codereview.chromium.org/676893002/)
Reason for revert: Build failure. http://build.chromium.org/p/chromium.linux/builders/Android%20Clang%20Builder%20%28dbg%29/builds/46535 ../mojo/android/javatests/src/org/chromium/mojo/bindings/ValidationTest.java:181:error: cannot find symbol @DisabledTest ^ Original issue's description: > Disabling testConformance in response to test failure > > https://build.chromium.org/p/chromium.linux/builders/Android%20Tests/builds/16405 > > BUG=426564 > R=jamesr@chromium.org > > Committed: https://chromium.googlesource.com/chromium/src/+/ed4f7a78af68cd8dcfea63c899fbaf3dd27716e6 TBR=jamesr@chromium.org,qyearsley@chromium.org NOTREECHECKS=true NOTRY=true BUG=426564 Review URL: https://codereview.chromium.org/654543003 Cr-Commit-Position: refs/heads/master@{#300948}
Diffstat (limited to 'mojo')
-rw-r--r--mojo/android/javatests/src/org/chromium/mojo/bindings/ValidationTest.java3
1 files changed, 1 insertions, 2 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 ee3891d..8bf5e21 100644
--- a/mojo/android/javatests/src/org/chromium/mojo/bindings/ValidationTest.java
+++ b/mojo/android/javatests/src/org/chromium/mojo/bindings/ValidationTest.java
@@ -176,9 +176,8 @@ public class ValidationTest extends MojoTestCase {
/**
* Testing the conformance suite.
- * Disabled: http://crbug.com/426564
*/
- @DisabledTest
+ @SmallTest
public void testConformance() throws FileNotFoundException {
runTest("conformance_", ConformanceTestInterface.MANAGER.buildStub(null,
ConformanceTestInterface.MANAGER.buildProxy(null, new SinkMessageReceiver())));