You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2015/06/29 10:28:21 UTC
mesos git commit: Change EXPECT to ASSERT in docker containerizer
tests that rely on assertion afterwards.
Repository: mesos
Updated Branches:
refs/heads/master a80609df2 -> b62517792
Change EXPECT to ASSERT in docker containerizer tests that rely on assertion afterwards.
Review: https://reviews.apache.org/r/35920
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b6251779
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b6251779
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b6251779
Branch: refs/heads/master
Commit: b62517792205babad7b11b3fae665024a3d5b3d5
Parents: a80609d
Author: Joerg Schad <jo...@mesosphere.io>
Authored: Mon Jun 29 10:27:03 2015 +0200
Committer: Bernd Mathiske <be...@mesosphere.io>
Committed: Mon Jun 29 10:27:04 2015 +0200
----------------------------------------------------------------------
src/tests/docker_containerizer_tests.cpp | 40 +++++++++++++--------------
1 file changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/b6251779/src/tests/docker_containerizer_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/docker_containerizer_tests.cpp b/src/tests/docker_containerizer_tests.cpp
index 3a983c6..d4ccb0b 100644
--- a/src/tests/docker_containerizer_tests.cpp
+++ b/src/tests/docker_containerizer_tests.cpp
@@ -449,7 +449,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Launch_Executor)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0u, offers.get().size());
+ ASSERT_NE(0u, offers.get().size());
const Offer& offer = offers.get()[0];
@@ -562,7 +562,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Launch_Executor_Bridged)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0u, offers.get().size());
+ ASSERT_NE(0u, offers.get().size());
const Offer& offer = offers.get()[0];
@@ -672,7 +672,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Launch)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0u, offers.get().size());
+ ASSERT_NE(0u, offers.get().size());
const Offer& offer = offers.get()[0];
@@ -774,7 +774,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Kill)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0u, offers.get().size());
+ ASSERT_NE(0u, offers.get().size());
const Offer& offer = offers.get()[0];
@@ -883,7 +883,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Usage)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0u, offers.get().size());
+ ASSERT_NE(0u, offers.get().size());
const Offer& offer = offers.get()[0];
@@ -1018,7 +1018,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Update)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0u, offers.get().size());
+ ASSERT_NE(0u, offers.get().size());
const Offer& offer = offers.get()[0];
@@ -1347,7 +1347,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Logs)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0u, offers.get().size());
+ ASSERT_NE(0u, offers.get().size());
const Offer& offer = offers.get()[0];
@@ -1468,7 +1468,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Default_CMD)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0u, offers.get().size());
+ ASSERT_NE(0u, offers.get().size());
const Offer& offer = offers.get()[0];
@@ -1592,7 +1592,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Default_CMD_Override)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0u, offers.get().size());
+ ASSERT_NE(0u, offers.get().size());
const Offer& offer = offers.get()[0];
@@ -1719,7 +1719,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Default_CMD_Args)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0u, offers.get().size());
+ ASSERT_NE(0u, offers.get().size());
const Offer& offer = offers.get()[0];
@@ -1850,7 +1850,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_SlaveRecoveryTaskContainer)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0u, offers.get().size());
+ ASSERT_NE(0u, offers.get().size());
const Offer& offer = offers.get()[0];
@@ -2001,7 +2001,7 @@ TEST_F(DockerContainerizerTest,
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0u, offers.get().size());
+ ASSERT_NE(0u, offers.get().size());
const Offer& offer = offers.get()[0];
@@ -2163,7 +2163,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_PortMapping)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0u, offers.get().size());
+ ASSERT_NE(0u, offers.get().size());
const Offer& offer = offers.get()[0];
@@ -2301,7 +2301,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_LaunchSandboxWithColon)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0u, offers.get().size());
+ ASSERT_NE(0u, offers.get().size());
const Offer& offer = offers.get()[0];
@@ -2410,7 +2410,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_DestroyWhileFetching)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0u, offers.get().size());
+ ASSERT_NE(0u, offers.get().size());
const Offer& offer = offers.get()[0];
@@ -2521,7 +2521,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_DestroyWhilePulling)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0u, offers.get().size());
+ ASSERT_NE(0u, offers.get().size());
const Offer& offer = offers.get()[0];
@@ -2625,7 +2625,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_ExecutorCleanupWhenLaunchFailed)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0u, offers.get().size());
+ ASSERT_NE(0u, offers.get().size());
const Offer& offer = offers.get()[0];
@@ -2725,7 +2725,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_FetchFailure)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0u, offers.get().size());
+ ASSERT_NE(0u, offers.get().size());
const Offer& offer = offers.get()[0];
@@ -2829,7 +2829,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_DockerPullFailure)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0u, offers.get().size());
+ ASSERT_NE(0u, offers.get().size());
const Offer& offer = offers.get()[0];
@@ -2942,7 +2942,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_DockerInspectDiscard)
AWAIT_READY(frameworkId);
AWAIT_READY(offers);
- EXPECT_NE(0u, offers.get().size());
+ ASSERT_NE(0u, offers.get().size());
const Offer& offer = offers.get()[0];