diff options
| author | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-20 18:14:43 +0000 |
|---|---|---|
| committer | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-20 18:18:23 +0000 |
| commit | 890d2d562af54faa8e39804efe41cfd1403c99bc (patch) | |
| tree | 0dc552b7fba2cee6f7b7f50c064b93518d564dbf /content/browser/geolocation/wifi_data_provider_common_unittest.cc | |
| parent | 6e469bab73c4ea440e08677d0f30014618778ff6 (diff) | |
| download | chromium_src-890d2d562af54faa8e39804efe41cfd1403c99bc.zip chromium_src-890d2d562af54faa8e39804efe41cfd1403c99bc.tar.gz chromium_src-890d2d562af54faa8e39804efe41cfd1403c99bc.tar.bz2 | |
Disable two geolocation wifi tests
See bug for details.
BUG=405596
NOTRY=true
TBR=mvanouwerkerk
Review URL: https://codereview.chromium.org/493773002
Cr-Commit-Position: refs/heads/master@{#290869}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290869 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/geolocation/wifi_data_provider_common_unittest.cc')
| -rw-r--r-- | content/browser/geolocation/wifi_data_provider_common_unittest.cc | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/content/browser/geolocation/wifi_data_provider_common_unittest.cc b/content/browser/geolocation/wifi_data_provider_common_unittest.cc index d6a3b08..a9357ba 100644 --- a/content/browser/geolocation/wifi_data_provider_common_unittest.cc +++ b/content/browser/geolocation/wifi_data_provider_common_unittest.cc @@ -182,7 +182,12 @@ TEST_F(GeolocationWifiDataProviderCommonTest, IntermittentWifi){ main_message_loop_.Run(); } -TEST_F(GeolocationWifiDataProviderCommonTest, DoAnEmptyScan) { +#if defined(OS_MACOSX) +#define MAYBE_DoAnEmptyScan DISABLED_DoAnEmptyScan +#else +#define MAYBE_DoAnEmptyScan DoAnEmptyScan +#endif +TEST_F(GeolocationWifiDataProviderCommonTest, MAYBE_DoAnEmptyScan) { EXPECT_CALL(*wlan_api_, GetAccessPointData(_)) .Times(AtLeast(1)); EXPECT_CALL(*polling_policy_, PollingInterval()) @@ -195,7 +200,12 @@ TEST_F(GeolocationWifiDataProviderCommonTest, DoAnEmptyScan) { EXPECT_EQ(0, static_cast<int>(data.access_point_data.size())); } -TEST_F(GeolocationWifiDataProviderCommonTest, DoScanWithResults) { +#if defined(OS_MACOSX) +#define MAYBE_DoScanWithResults DISABLED_DoScanWithResults +#else +#define MAYBE_DoScanWithResults DoScanWithResults +#endif +TEST_F(GeolocationWifiDataProviderCommonTest, MAYBE_DoScanWithResults) { EXPECT_CALL(*wlan_api_, GetAccessPointData(_)) .Times(AtLeast(1)); EXPECT_CALL(*polling_policy_, PollingInterval()) |