mesos git commit: Fixed 'SharedPersistentVolumeRescindOnDestroy' test.

[ya...@apache.org]

Repository: mesos
Updated Branches:
  refs/heads/master 713b784a3 -> 44cc1932c


Fixed 'SharedPersistentVolumeRescindOnDestroy' test.


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

Branch: refs/heads/master
Commit: 44cc1932cb27001f0b73cee011d00c45fbd1764c
Parents: 713b784
Author: Jiang Yan Xu <xu...@apple.com>
Authored: Wed Oct 12 14:11:44 2016 -0700
Committer: Jiang Yan Xu <xu...@apple.com>
Committed: Wed Oct 12 14:11:53 2016 -0700

----------------------------------------------------------------------
 src/tests/persistent_volume_tests.cpp | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/44cc1932/src/tests/persistent_volume_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/persistent_volume_tests.cpp b/src/tests/persistent_volume_tests.cpp
index b7d1c1a..6289009 100644
--- a/src/tests/persistent_volume_tests.cpp
+++ b/src/tests/persistent_volume_tests.cpp
@@ -1116,8 +1116,12 @@ TEST_P(PersistentVolumeTest, SharedPersistentVolumeRescindOnDestroy)
 
   // Advance the clock until the allocator allocates
   // the recovered resources.
+  Clock::settle();
   Clock::advance(masterFlags.allocation_interval);
 
+  // Resume the clock so the terminating task and executor can be reaped.
+  Clock::resume();
+
   AWAIT_READY(offers1);
 
   offer1 = offers1.get()[0];