diff options
| author | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-20 08:41:36 +0000 |
|---|---|---|
| committer | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-20 08:41:36 +0000 |
| commit | 7a64937555798c066b49ae29de060b26ca551d03 (patch) | |
| tree | 5f9cec27caa2120591bcc5a92c290a55e3f9aafc /android_webview | |
| parent | 81fea5cf5efec198c541525f2260faec284e2b9a (diff) | |
| download | chromium_src-7a64937555798c066b49ae29de060b26ca551d03.zip chromium_src-7a64937555798c066b49ae29de060b26ca551d03.tar.gz chromium_src-7a64937555798c066b49ae29de060b26ca551d03.tar.bz2 | |
Fix AwSettingsTest.testBlockNetworkImagesBlocksNetworkImageAndReloadInPlace
It looks like the test wasn't flaky but just plain wrong. After fixing
the test works reliably.
BUG=243094
R=boliu@chromium.org
Review URL: https://codereview.chromium.org/17449007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207363 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java index a209e6af..c445324 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java @@ -1742,12 +1742,8 @@ public class AwSettingsTest extends AwTestBase { assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(awContents)); } - /* @SmallTest @Feature({"AndroidWebView", "Preferences"}) - Flaky test that times out on pooForCriteria. crbug.com/243094 - */ - @DisabledTest public void testBlockNetworkImagesBlocksNetworkImageAndReloadInPlace() throws Throwable { final TestAwContentsClient contentClient = new TestAwContentsClient(); final AwTestContainerView testContainerView = @@ -1778,7 +1774,7 @@ public class AwSettingsTest extends AwTestBase { @Override public boolean isSatisfied() { try { - return ImagePageGenerator.IMAGE_NOT_LOADED_STRING.equals( + return ImagePageGenerator.IMAGE_LOADED_STRING.equals( getTitleOnUiThread(awContents)); } catch (Throwable t) { t.printStackTrace(); |