You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2016/10/19 23:33:54 UTC
[04/10] mesos git commit: Clarified a comment that occurs in several
tests.
Clarified a comment that occurs in several tests.
Review: https://reviews.apache.org/r/52657/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/1a3e931f
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/1a3e931f
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/1a3e931f
Branch: refs/heads/master
Commit: 1a3e931fc671ba063c7eac8f43cbf28b4c9f727b
Parents: 0bef37a
Author: Neil Conway <ne...@gmail.com>
Authored: Wed Oct 19 16:31:51 2016 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Wed Oct 19 16:31:51 2016 -0700
----------------------------------------------------------------------
src/tests/master_authorization_tests.cpp | 12 ++++++------
src/tests/master_validation_tests.cpp | 6 +++---
2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/1a3e931f/src/tests/master_authorization_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_authorization_tests.cpp b/src/tests/master_authorization_tests.cpp
index a4623d1..a53e270 100644
--- a/src/tests/master_authorization_tests.cpp
+++ b/src/tests/master_authorization_tests.cpp
@@ -233,7 +233,7 @@ TEST_F(MasterAuthorizationTest, UnauthorizedTask)
driver.reconcileTasks({});
- // We pause the clock here to ensure any updates sent by the master
+ // We settle the clock here to ensure any updates sent by the master
// are received. There shouldn't be any updates in this case.
Clock::pause();
Clock::settle();
@@ -343,7 +343,7 @@ TEST_F(MasterAuthorizationTest, UnauthorizedTaskGroup)
driver.reconcileTasks({});
- // We pause the clock here to ensure any updates sent by the master
+ // We settle the clock here to ensure any updates sent by the master
// are received. There shouldn't be any updates in this case.
Clock::pause();
Clock::settle();
@@ -426,7 +426,7 @@ TEST_F(MasterAuthorizationTest, KillTask)
driver.reconcileTasks({});
- // We pause the clock here to ensure any updates sent by the master
+ // We settle the clock here to ensure any updates sent by the master
// are received. There shouldn't be any updates in this case.
Clock::pause();
Clock::settle();
@@ -556,7 +556,7 @@ TEST_F(MasterAuthorizationTest, KillPendingTaskInTaskGroup)
driver.reconcileTasks({});
- // We pause the clock here to ensure any updates sent by the master
+ // We settle the clock here to ensure any updates sent by the master
// are received. There shouldn't be any updates in this case.
Clock::pause();
Clock::settle();
@@ -659,7 +659,7 @@ TEST_F(MasterAuthorizationTest, SlaveRemoved)
driver.reconcileTasks({});
- // We pause the clock here to ensure any updates sent by the master
+ // We settle the clock here to ensure any updates sent by the master
// are received. There shouldn't be any updates in this case.
Clock::pause();
Clock::settle();
@@ -765,7 +765,7 @@ TEST_F(MasterAuthorizationTest, SlaveDisconnected)
driver.reconcileTasks({});
- // We pause the clock here to ensure any updates sent by the master
+ // We settle the clock here to ensure any updates sent by the master
// are received. There shouldn't be any updates in this case.
Clock::pause();
Clock::settle();
http://git-wip-us.apache.org/repos/asf/mesos/blob/1a3e931f/src/tests/master_validation_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_validation_tests.cpp b/src/tests/master_validation_tests.cpp
index da43f99..a5d8610 100644
--- a/src/tests/master_validation_tests.cpp
+++ b/src/tests/master_validation_tests.cpp
@@ -718,7 +718,7 @@ TEST_F(TaskValidationTest, ExecutorUsesInvalidFrameworkID)
driver.reconcileTasks({});
- // We pause the clock here to ensure any updates sent by the master
+ // We settle the clock here to ensure any updates sent by the master
// are received. There shouldn't be any updates in this case.
Clock::pause();
Clock::settle();
@@ -1826,7 +1826,7 @@ TEST_F(TaskGroupValidationTest, ExecutorUsesDockerContainerInfo)
driver.reconcileTasks({});
- // We pause the clock here to ensure any updates sent by the master
+ // We settle the clock here to ensure any updates sent by the master
// are received. There shouldn't be any updates in this case.
Clock::pause();
Clock::settle();
@@ -1916,7 +1916,7 @@ TEST_F(TaskGroupValidationTest, ExecutorWithoutFrameworkId)
driver.reconcileTasks({});
- // We pause the clock here to ensure any updates sent by the master
+ // We settle the clock here to ensure any updates sent by the master
// are received. There shouldn't be any updates in this case.
Clock::pause();
Clock::settle();