You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2016/07/07 01:43:34 UTC

mesos git commit: Fixed the flaky DiskQuotaTest.SlaveRecovery.

Repository: mesos
Updated Branches:
  refs/heads/master 52f9661a5 -> 3fccd5390


Fixed the flaky DiskQuotaTest.SlaveRecovery.


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/3fccd539
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/3fccd539
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/3fccd539

Branch: refs/heads/master
Commit: 3fccd539043b2745c5bc040d15667fcf89117114
Parents: 52f9661
Author: Jie Yu <yu...@gmail.com>
Authored: Wed Jul 6 18:43:15 2016 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Wed Jul 6 18:43:26 2016 -0700

----------------------------------------------------------------------
 src/tests/disk_quota_tests.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/3fccd539/src/tests/disk_quota_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/disk_quota_tests.cpp b/src/tests/disk_quota_tests.cpp
index 53de868..f379a6e 100644
--- a/src/tests/disk_quota_tests.cpp
+++ b/src/tests/disk_quota_tests.cpp
@@ -652,8 +652,9 @@ TEST_F(DiskQuotaTest, SlaveRecovery)
 
       // NOTE: This is to capture the regression in MESOS-2452. The data
       // stored in the executor meta directory should be less than 64K.
-      EXPECT_GT(usage.get().disk_used_bytes(), Kilobytes(64).bytes());
-      break;
+      if (usage.get().disk_used_bytes() > Kilobytes(64).bytes()) {
+        break;
+      }
     }
 
     ASSERT_LT(elapsed, Seconds(15));