From 96980d954d764fb8a5af1e03c11e16c43e978f68 Mon Sep 17 00:00:00 2001 From: Dong Chen Date: Wed, 23 Mar 2016 18:29:16 -0700 Subject: [PATCH] Skip unstable tests from Docker bug 14203. Signed-off-by: Dong Chen --- test/integration/nodemanagement/nodehealth.bats | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/integration/nodemanagement/nodehealth.bats b/test/integration/nodemanagement/nodehealth.bats index 35ce2960a1..cc47bbc853 100644 --- a/test/integration/nodemanagement/nodehealth.bats +++ b/test/integration/nodemanagement/nodehealth.bats @@ -9,9 +9,9 @@ function teardown() { @test "scheduler avoids failing node" { # Docker issue #14203 in runC causing this test to fail. - # Issue fixed in Docker 1.10 + # Issue fixed after Docker 1.10 run docker --version - if [[ "${output}" == "Docker version 1.9"* ]]; then + if [[ "${output}" == "Docker version 1.9"* || "${output}" == "Docker version 1.10"* ]]; then skip fi @@ -41,9 +41,9 @@ function teardown() { @test "refresh loop detects failure" { # Docker issue #14203 in runC causing this test to fail. - # Issue fixed in Docker 1.10 + # Issue fixed after Docker 1.10 run docker --version - if [[ "${output}" == "Docker version 1.9"* ]]; then + if [[ "${output}" == "Docker version 1.9"* || "${output}" == "Docker version 1.10"* ]]; then skip fi @@ -71,9 +71,9 @@ function teardown() { @test "scheduler retry" { # Docker issue #14203 in runC causing this test to fail. - # Issue fixed in Docker 1.10 + # Issue fixed after Docker 1.10 run docker --version - if [[ "${output}" == "Docker version 1.9"* ]]; then + if [[ "${output}" == "Docker version 1.9"* || "${output}" == "Docker version 1.10"* ]]; then skip fi