commit 45e2ae284660b640cba967bb266f8d2ab766021d
author David Zeuthen <zeuthen@chromium.org> Tue Sep 03 11:46:11 2013 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Wed Sep 04 00:56:58 2013 +0000
tree 92dd46a47a1bbaddb922238812f64c87944721d3
parent ad92373f42fdf5cdf65774376ee176b9da92ff3b

p2p: rewrite P2PManager.Housekeeping test so it's not flaky

Instead of sleeping so the kernel chooses a new timestamp, just set it
manually. Also spell housekeeping as one word instead of two.

BUG=chromium:281694
TEST=unit tests pass

Change-Id: I124131e2e4d7c1deeaa666affd1f78a6d98b24a5
Reviewed-on: https://chromium-review.googlesource.com/167882
Reviewed-by: Alex Deymo <deymo@chromium.org>
Commit-Queue: David Zeuthen <zeuthen@chromium.org>
Tested-by: David Zeuthen <zeuthen@chromium.org>

p2p_manager_unittest.cc

diff --git a/p2p_manager_unittest.cc b/p2p_manager_unittest.cc
index 449387b..891b849 100644
--- a/p2p_manager_unittest.cc
+++ b/p2p_manager_unittest.cc
@@ -68,29 +68,26 @@
   EXPECT_TRUE(utils::RecursiveUnlinkDir(temp_dir));
 }
 
-// TODO(zeuthen): This test is flaky on some builders. See http://crbug/281694
-#if 0
-
 // Check that we keep the $N newest files with the .$EXT.p2p extension.
-TEST_F(P2PManagerTest, HouseKeeping) {
+TEST_F(P2PManagerTest, Housekeeping) {
   scoped_ptr<P2PManager> manager(P2PManager::Construct(test_conf_,
                                                        NULL, "cros_au", 3));
   EXPECT_EQ(manager->CountSharedFiles(), 0);
 
   // Generate files both matching our pattern and not matching them.
   for (int n = 0; n < 5; n++) {
-    EXPECT_EQ(0, System(StringPrintf("touch %s/file_%d.cros_au.p2p",
+    // We space out the files to be one minute apart.
+    string time_formatted = StringPrintf("2010090311%02d", n);
+
+    EXPECT_EQ(0, System(StringPrintf("touch -t %s %s/file_%d.cros_au.p2p",
+                                     time_formatted.c_str(),
                                      test_conf_->GetP2PDir().value().c_str(),
                                      n)));
 
-    EXPECT_EQ(0, System(StringPrintf("touch %s/file_%d.OTHER.p2p",
+    EXPECT_EQ(0, System(StringPrintf("touch -t %s %s/file_%d.OTHER.p2p",
+                                     time_formatted.c_str(),
                                      test_conf_->GetP2PDir().value().c_str(),
                                      n)));
-
-    // Sleep one micro-second to ensure that the files all have
-    // different timestamps (time resolution for ext4 is one
-    // nano-second so sleeping a single usec is more than enough).
-    g_usleep(1);
   }
   // CountSharedFiles() only counts 'cros_au' files.
   EXPECT_EQ(manager->CountSharedFiles(), 5);
@@ -116,8 +113,6 @@
   EXPECT_EQ(manager->CountSharedFiles(), 3);
 }
 
-#endif // http://crbug/281694
-
 // TODO(zeuthen): Some builders do not support fallocate(2) or xattrs
 // in the tmp directories where the code runs so comment out these
 // tests for now. See http://crbug.com/281496