summaryrefslogtreecommitdiffstats
path: root/ios/web/web_state
diff options
context:
space:
mode:
authoreugenebut <eugenebut@chromium.org>2016-03-04 10:35:04 -0800
committerCommit bot <commit-bot@chromium.org>2016-03-04 18:37:40 +0000
commit70810e15c6c90b1e2ff5700d7dc265f6dd276f9b (patch)
treee0743cdbd2b1653be0e99b4ee8d428ee46fbd7dd /ios/web/web_state
parent454fb37caa9aae13f0baf827c13a555d940db1f9 (diff)
downloadchromium_src-70810e15c6c90b1e2ff5700d7dc265f6dd276f9b.zip
chromium_src-70810e15c6c90b1e2ff5700d7dc265f6dd276f9b.tar.gz
chromium_src-70810e15c6c90b1e2ff5700d7dc265f6dd276f9b.tar.bz2
Marked CRWJSPOSTRequestLoaderTest.LoadsCorrectHTML as flaky on device.
Also removed obsoleted CR_TEST_REQUIRES_WK_WEB_VIEW macro. BUG=592034 Review URL: https://codereview.chromium.org/1766763002 Cr-Commit-Position: refs/heads/master@{#379321}
Diffstat (limited to 'ios/web/web_state')
-rw-r--r--ios/web/web_state/js/crw_js_post_request_loader_unittest.mm10
1 files changed, 7 insertions, 3 deletions
diff --git a/ios/web/web_state/js/crw_js_post_request_loader_unittest.mm b/ios/web/web_state/js/crw_js_post_request_loader_unittest.mm
index aa6a4d0..0e4b545 100644
--- a/ios/web/web_state/js/crw_js_post_request_loader_unittest.mm
+++ b/ios/web/web_state/js/crw_js_post_request_loader_unittest.mm
@@ -35,9 +35,13 @@ NSString* const kBlobToBase64StringScript =
"};";
// Tests that the POST request is correctly executed through XMLHttpRequest.
-TEST_F(CRWJSPOSTRequestLoaderTest, LoadsCorrectHTML) {
- CR_TEST_REQUIRES_WK_WEB_VIEW();
-
+// TODO(crbug.com/592034): This test is flaky on device.
+#if TARGET_IPHONE_SIMULATOR
+#define MAYBE_LoadsCorrectHTML LoadsCorrectHTML
+#else
+#define MAYBE_LoadsCorrectHTML FLAKY_LoadsCorrectHTML
+#endif
+TEST_F(CRWJSPOSTRequestLoaderTest, MAYBE_LoadsCorrectHTML) {
// Set up necessary objects.
scoped_nsobject<CRWJSPOSTRequestLoader> loader(
[[CRWJSPOSTRequestLoader alloc] init]);