aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-01-03 22:46:53 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-01-03 22:46:53 +0000
commit0ed619a90ccade52eb2492f6a6ffb2008beda437 (patch)
tree074f1173994d82f913b7d75ffe61c1df9c23f1b9
parent5d4d2d4f6564e18f00ccceeb9888585dca537452 (diff)
downloadpaludis-0ed619a90ccade52eb2492f6a6ffb2008beda437.tar.gz
paludis-0ed619a90ccade52eb2492f6a6ffb2008beda437.tar.xz
fix tests fail
-rw-r--r--paludis/merger_TEST.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/paludis/merger_TEST.cc b/paludis/merger_TEST.cc
index 7862949..e10884d 100644
--- a/paludis/merger_TEST.cc
+++ b/paludis/merger_TEST.cc
@@ -546,6 +546,7 @@ namespace test_cases
{
Timestamp m_new((image_dir / "new_file").mtim());
Timestamp m_existing((image_dir / "existing_file").mtim());
+ Timestamp m_dir_new((image_dir / "dir" / "new_file").mtim());
TEST_CHECK(merger.check());
merger.merge();
@@ -554,7 +555,7 @@ namespace test_cases
TEST_CHECK((root_dir / "existing_file").mtim() == m_existing);
TEST_CHECK(Timestamp::now().seconds() - (root_dir / "dodgy_file").mtim().seconds() >= (60 * 60 * 24 * 365 * 3) - 1);
- TEST_CHECK((root_dir / "dir" / "new_file").mtim() == m_new);
+ TEST_CHECK((root_dir / "dir" / "new_file").mtim() == m_dir_new);
TEST_CHECK(Timestamp::now().seconds() - (root_dir / "dir" / "dodgy_file").mtim().seconds() >= (60 * 60 * 24 * 365 * 3) - 1);
}
} test_merger_mtimes;
@@ -567,6 +568,7 @@ namespace test_cases
{
Timestamp m_new((image_dir / "new_file").mtim());
Timestamp m_existing((image_dir / "existing_file").mtim());
+ Timestamp m_dir_new((image_dir / "dir" / "new_file").mtim());
TEST_CHECK(merger.check());
merger.merge();
@@ -575,7 +577,7 @@ namespace test_cases
TEST_CHECK((root_dir / "existing_file").mtim() == m_existing);
TEST_CHECK((root_dir / "dodgy_file").mtim() == FSEntry("merger_TEST_dir/reference").mtim());
- TEST_CHECK((root_dir / "dir" / "new_file").mtim() == m_new);
+ TEST_CHECK((root_dir / "dir" / "new_file").mtim() == m_dir_new);
TEST_CHECK((root_dir / "dir" / "dodgy_file").mtim() == FSEntry("merger_TEST_dir/reference").mtim());
}
} test_merger_mtimes_fix;