Repository: mesos Updated Branches: refs/heads/master 081c3114f -> 01b618c41
Fixed a disk space check in the XFS tests. The XFS tests were requiring that at least 2MB of data was written, but the test can still correctly pass after only 1MB had been written. Review: https://reviews.apache.org/r/66986/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/01b618c4 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/01b618c4 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/01b618c4 Branch: refs/heads/master Commit: 01b618c416507b7d43bf435b870dc26b2361e9f4 Parents: 081c311 Author: James Peach <[email protected]> Authored: Mon May 7 09:03:42 2018 -0700 Committer: James Peach <[email protected]> Committed: Mon May 7 09:03:42 2018 -0700 ---------------------------------------------------------------------- src/tests/containerizer/xfs_quota_tests.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/01b618c4/src/tests/containerizer/xfs_quota_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/xfs_quota_tests.cpp b/src/tests/containerizer/xfs_quota_tests.cpp index ec9d86d..3431c1c 100644 --- a/src/tests/containerizer/xfs_quota_tests.cpp +++ b/src/tests/containerizer/xfs_quota_tests.cpp @@ -610,12 +610,12 @@ TEST_F(ROOT_XFS_QuotaTest, DiskUsageExceedsQuotaWithKill) Resources limit = Resources(killedStatus->limitation().resources()); // Expect that we were limited on a single disk resource that represents - // the amount of disk that the task consumed. Note that while the task - // used up to 2MB, the executor logs might use more so we have to check - // for >= 2MB in this expectation. + // the amount of disk that the task consumed. The task used up to 2MB + // and the the executor logs might use more, but as long we report that + // the task used more than the 1MB in its resources, we are happy. EXPECT_EQ(1u, limit.size()); ASSERT_SOME(limit.disk()); - EXPECT_GE(limit.disk().get(), Megabytes(2)); + EXPECT_GT(limit.disk().get(), Megabytes(1)); driver.stop(); driver.join();
