diff options
author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-03 20:46:28 +0000 |
---|---|---|
committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-03 20:46:28 +0000 |
commit | 3e57eda177b3bfd4375e51ab3d8e30c02bd26085 (patch) | |
tree | 17c8b3d1c61ae499394e160ed4a225815ed42cf2 /sync/internal_api/public | |
parent | 7bc12cd621b764d162c4057f45a7e05f203c0297 (diff) | |
download | chromium_src-3e57eda177b3bfd4375e51ab3d8e30c02bd26085.zip chromium_src-3e57eda177b3bfd4375e51ab3d8e30c02bd26085.tar.gz chromium_src-3e57eda177b3bfd4375e51ab3d8e30c02bd26085.tar.bz2 |
Disable flaky CancelationSignalTest.Cancel on iOS and Mac.
Recent flake:
http://build.chromium.org/p/chromium.mac/builders/iOS%20Simulator%20%28dbg%29/builds/15075
Flakiness dashboard:
http://chromium-build-logs.appspot.com/gtest_query?gtest_query=CancelationSignalTest.Cancel
BUG=340360
TEST=none
R=erg@chromium.org
TBR=rlarocque@chromium.org
NOTRY=true
Review URL: https://codereview.chromium.org/148613010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248569 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/internal_api/public')
-rw-r--r-- | sync/internal_api/public/base/cancelation_signal_unittest.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sync/internal_api/public/base/cancelation_signal_unittest.cc b/sync/internal_api/public/base/cancelation_signal_unittest.cc index 613e756..ab75918 100644 --- a/sync/internal_api/public/base/cancelation_signal_unittest.cc +++ b/sync/internal_api/public/base/cancelation_signal_unittest.cc @@ -155,12 +155,18 @@ TEST_F(CancelationSignalTest, CancelEarly) { EXPECT_TRUE(VerifyTaskNotStarted()); } +// This test is flaky on iOS and Mac; see http://crbug.com/340360 +#if defined(OS_IOS) || defined(OS_MACOSX) +#define MAYBE_Cancel DISABLED_Cancel +#else +#define MAYBE_Cancel Cancel +#endif // Send the cancelation signal after the request to start the task has been // posted. This is racy. The signal to stop may arrive before the signal to // run the task. If that happens, we end up with another instance of the // CancelEarly test defined earlier. If the signal requesting a stop arrives // after the task has been started, it should end up stopping the task. -TEST_F(CancelationSignalTest, Cancel) { +TEST_F(CancelationSignalTest, MAYBE_Cancel) { StartBlockingTask(); CancelBlocking(); EXPECT_TRUE(VerifyTaskDone()); |