Repository: mesos Updated Branches: refs/heads/master b27f7f7a6 -> b2f5c62c9
Minor naming cleanup in composing containerizer tests. This was pulled out from https://reviews.apache.org/r/52056/ as a separate cleanup patch. Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b2f5c62c Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b2f5c62c Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b2f5c62c Branch: refs/heads/master Commit: b2f5c62c903445d47a92200acc83ea03d719c2e8 Parents: 2d20e0f Author: Benjamin Mahler <bmah...@apache.org> Authored: Wed Sep 21 15:22:36 2016 -0700 Committer: Benjamin Mahler <bmah...@apache.org> Committed: Wed Sep 21 15:55:01 2016 -0700 ---------------------------------------------------------------------- .../containerizer/composing_containerizer_tests.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/b2f5c62c/src/tests/containerizer/composing_containerizer_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/composing_containerizer_tests.cpp b/src/tests/containerizer/composing_containerizer_tests.cpp index 78d666d..6772c7e 100644 --- a/src/tests/containerizer/composing_containerizer_tests.cpp +++ b/src/tests/containerizer/composing_containerizer_tests.cpp @@ -108,10 +108,10 @@ TEST_F(ComposingContainerizerTest, DestroyDuringLaunchLoop) { vector<Containerizer*> containerizers; - MockContainerizer* mockContainerizer = new MockContainerizer(); + MockContainerizer* mockContainerizer1 = new MockContainerizer(); MockContainerizer* mockContainerizer2 = new MockContainerizer(); - containerizers.push_back(mockContainerizer); + containerizers.push_back(mockContainerizer1); containerizers.push_back(mockContainerizer2); ComposingContainerizer containerizer(containerizers); @@ -124,12 +124,12 @@ TEST_F(ComposingContainerizerTest, DestroyDuringLaunchLoop) Promise<bool> launchPromise; - EXPECT_CALL(*mockContainerizer, launch(_, _, _, _, _, _, _, _)) + EXPECT_CALL(*mockContainerizer1, launch(_, _, _, _, _, _, _, _)) .WillOnce(Return(launchPromise.future())); Future<Nothing> destroy; - EXPECT_CALL(*mockContainerizer, destroy(_)) + EXPECT_CALL(*mockContainerizer1, destroy(_)) .WillOnce(DoAll(FutureSatisfy(&destroy), Return(Future<bool>(false)))); @@ -168,10 +168,10 @@ TEST_F(ComposingContainerizerTest, DestroyUnknownContainer) { vector<Containerizer*> containerizers; - MockContainerizer* mockContainerizer = new MockContainerizer(); + MockContainerizer* mockContainerizer1 = new MockContainerizer(); MockContainerizer* mockContainerizer2 = new MockContainerizer(); - containerizers.push_back(mockContainerizer); + containerizers.push_back(mockContainerizer1); containerizers.push_back(mockContainerizer2); ComposingContainerizer containerizer(containerizers); @@ -189,10 +189,10 @@ TEST_F(ComposingContainerizerTest, WaitUnknownContainer) { vector<Containerizer*> containerizers; - MockContainerizer* mockContainerizer = new MockContainerizer(); + MockContainerizer* mockContainerizer1 = new MockContainerizer(); MockContainerizer* mockContainerizer2 = new MockContainerizer(); - containerizers.push_back(mockContainerizer); + containerizers.push_back(mockContainerizer1); containerizers.push_back(mockContainerizer2); ComposingContainerizer containerizer(containerizers);
