You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2015/12/29 04:32:52 UTC
[5/5] mesos git commit: Fixed a compilation issue in slave_tests.cpp.
Fixed a compilation issue in slave_tests.cpp.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/1b865afb
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/1b865afb
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/1b865afb
Branch: refs/heads/master
Commit: 1b865afb5d699fd71e74df2342d4687ed53cbf12
Parents: 19dfc49
Author: Benjamin Mahler <be...@gmail.com>
Authored: Mon Dec 28 18:03:41 2015 -0800
Committer: Benjamin Mahler <be...@gmail.com>
Committed: Mon Dec 28 19:22:16 2015 -0800
----------------------------------------------------------------------
src/tests/slave_tests.cpp | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/1b865afb/src/tests/slave_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp
index 90d56b9..68d7517 100644
--- a/src/tests/slave_tests.cpp
+++ b/src/tests/slave_tests.cpp
@@ -83,7 +83,6 @@ using testing::Eq;
using testing::Invoke;
using testing::Return;
using testing::SaveArg;
-using testing::Sequence;
namespace mesos {
namespace internal {
@@ -1543,7 +1542,7 @@ TEST_F(SlaveTest, ContainerUpdatedBeforeTaskReachesExecutor)
// `containerizer->update` or `exec->launchTask`. We want to make
// sure that containerizer update always finishes before the task is
// sent to the executor.
- Sequence sequence;
+ testing::Sequence sequence;
EXPECT_CALL(containerizer, update(_, _))
.InSequence(sequence)