diff options
| author | peletskyi <peletskyi@chromium.org> | 2015-05-06 01:56:09 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-06 08:56:47 +0000 |
| commit | 0553612c0d1d07b64a71dac69cc05dca7aed841f (patch) | |
| tree | edcb3a48808e786bd6c8921ff4d07dc259d04351 | |
| parent | da457c18bd936701af978f9ad8f6ff7f6354136f (diff) | |
| download | chromium_src-0553612c0d1d07b64a71dac69cc05dca7aed841f.zip chromium_src-0553612c0d1d07b64a71dac69cc05dca7aed841f.tar.gz chromium_src-0553612c0d1d07b64a71dac69cc05dca7aed841f.tar.bz2 | |
Fixed some race conditions in DeviceStatusCollectorTest
Fixes race conditions in DeviceStatusCollectorTest.TestVolumeInfo, and TestCPUSamples
BUG=474325
Review URL: https://codereview.chromium.org/1114143002
Cr-Commit-Position: refs/heads/master@{#328508}
| -rw-r--r-- | chrome/browser/chromeos/policy/device_status_collector_browsertest.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc b/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc index dbd79a7..195d859 100644 --- a/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc +++ b/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc @@ -811,6 +811,8 @@ TEST_F(DeviceStatusCollectorTest, TestVolumeInfo) { RestartStatusCollector(base::Bind(&GetFakeVolumeInfo, expected_volume_info), base::Bind(&GetEmptyCPUStatistics)); + // Force finishing tasks posted by ctor of DeviceStatusCollector. + content::BrowserThread::GetBlockingPool()->FlushForTesting(); message_loop_.RunUntilIdle(); GetStatus(); @@ -856,12 +858,13 @@ TEST_F(DeviceStatusCollectorTest, TestAvailableMemory) { EXPECT_GT(status_.system_ram_total(), 0); } -// Test is disabled because it is flaky on Asan bot (See crbug.com/474325) -TEST_F(DeviceStatusCollectorTest, DISABLED_TestCPUSamples) { +TEST_F(DeviceStatusCollectorTest, TestCPUSamples) { // Mock 100% CPU usage. std::string full_cpu_usage("cpu 500 0 500 0 0 0 0"); RestartStatusCollector(base::Bind(&GetEmptyVolumeInfo), base::Bind(&GetFakeCPUStatistics, full_cpu_usage)); + // Force finishing tasks posted by ctor of DeviceStatusCollector. + content::BrowserThread::GetBlockingPool()->FlushForTesting(); message_loop_.RunUntilIdle(); GetStatus(); ASSERT_EQ(1, status_.cpu_utilization_pct().size()); |