diff options
| author | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-28 20:58:11 +0000 |
|---|---|---|
| committer | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-28 20:58:11 +0000 |
| commit | b522faca78290860605455f917fc77c47f152f11 (patch) | |
| tree | b14f6c6b6bd840a5149c95e1bb8651b887d3d479 /chrome/browser | |
| parent | 6afe28a5de0d45c88870629b3f013f78a28f68c1 (diff) | |
| download | chromium_src-b522faca78290860605455f917fc77c47f152f11.zip chromium_src-b522faca78290860605455f917fc77c47f152f11.tar.gz chromium_src-b522faca78290860605455f917fc77c47f152f11.tar.bz2 | |
Fix flaky test causing tree to go red
BUG=http://crbug.com/33410
TEST=Run whilst loading machine: unit_tests.exe --gtest_filter=Win32* --gtest_repeat=9000 --gtest_break_on_failure
Review URL: http://codereview.chromium.org/554122
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37436 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/geolocation/wifi_data_provider_unittest_win.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/geolocation/wifi_data_provider_unittest_win.cc b/chrome/browser/geolocation/wifi_data_provider_unittest_win.cc index b5dc608..3710e76 100644 --- a/chrome/browser/geolocation/wifi_data_provider_unittest_win.cc +++ b/chrome/browser/geolocation/wifi_data_provider_unittest_win.cc @@ -107,10 +107,13 @@ TEST_F(Win32WifiDataProviderTest, DoAnEmptyScan) { provider_->AddListener(&quit_listener); EXPECT_TRUE(provider_->StartDataProvider()); main_message_loop_.Run(); - EXPECT_EQ(1, wlan_api_->calls_); + // Check we had at least one call. The worker thread may have raced ahead + // and made multiple calls. + EXPECT_GT(wlan_api_->calls_, 0); WifiData data; EXPECT_TRUE(provider_->GetData(&data)); EXPECT_EQ(0, data.access_point_data.size()); + provider_->RemoveListener(&quit_listener); } TEST_F(Win32WifiDataProviderTest, DoScanWithResults) { @@ -127,12 +130,13 @@ TEST_F(Win32WifiDataProviderTest, DoScanWithResults) { EXPECT_TRUE(provider_->StartDataProvider()); main_message_loop_.Run(); - EXPECT_EQ(1, wlan_api_->calls_); + EXPECT_GT(wlan_api_->calls_, 0); WifiData data; EXPECT_TRUE(provider_->GetData(&data)); EXPECT_EQ(1, data.access_point_data.size()); EXPECT_EQ(single_access_point.age, data.access_point_data.begin()->age); EXPECT_EQ(single_access_point.ssid, data.access_point_data.begin()->ssid); + provider_->RemoveListener(&quit_listener); } TEST_F(Win32WifiDataProviderTest, StartThreadViaDeviceDataProvider) { |