Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(319)

Unified Diff: content/shell/android/javatests/src/org/chromium/content_shell/ContentShellUrlTest.java

Issue 10829104: Android: upstream @DisabledTest annotation for instrumentation tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/android/javatests/src/org/chromium/base/test/DisabledTest.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/android/javatests/src/org/chromium/content_shell/ContentShellUrlTest.java
diff --git a/content/shell/android/javatests/src/org/chromium/content_shell/ContentShellUrlTest.java b/content/shell/android/javatests/src/org/chromium/content_shell/ContentShellUrlTest.java
index f8b960ccdfaf1b8a9254e7613e5494e472dfbbdf..5388fcd6ff3df05fd007c87280ab9827417667a5 100644
--- a/content/shell/android/javatests/src/org/chromium/content_shell/ContentShellUrlTest.java
+++ b/content/shell/android/javatests/src/org/chromium/content_shell/ContentShellUrlTest.java
@@ -8,6 +8,8 @@ import android.app.Activity;
import android.test.ActivityInstrumentationTestCase2;
import android.test.suitebuilder.annotation.SmallTest;
+import org.chromium.base.test.DisabledTest;
+
/**
* Example test that just starts the content shell.
*/
@@ -15,7 +17,7 @@ public class ContentShellUrlTest extends ContentShellTestBase {
// URL used for base tests.
private static final String URL = "data:text";
- @SmallTest
+ @DisabledTest
public void testBaseStartup() throws Exception {
ContentShellActivity activity = launchContentShellWithUrl(URL);
« no previous file with comments | « base/android/javatests/src/org/chromium/base/test/DisabledTest.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698