From 1fed89ff2061eaa8ab2c2bc76b63bb0a1d6321f8 Mon Sep 17 00:00:00 2001 From: junxiawang Date: Wed, 26 Apr 2017 01:54:48 -0400 Subject: [PATCH 1/2] docker version updated and the output for docker command changed so modify the testcase --- xCAT-test/autotest/testcase/dockercommand/cases0 | 1 - 1 file changed, 1 deletion(-) diff --git a/xCAT-test/autotest/testcase/dockercommand/cases0 b/xCAT-test/autotest/testcase/dockercommand/cases0 index 4b21baac0..b87da9d35 100644 --- a/xCAT-test/autotest/testcase/dockercommand/cases0 +++ b/xCAT-test/autotest/testcase/dockercommand/cases0 @@ -244,7 +244,6 @@ cmd:rpower $$DOCKERCN start check:rc==0 cmd:rmdocker $$DOCKERCN chec:rc!=0 -check:output=~Stop the container before attempting removal or use -f cmd:rmdocker $$DOCKERCN -f check:rc==0 check:output=~$$DOCKERCN: success From 4a9a7d53ae1a81cff297b72a3e0977fef3e87189 Mon Sep 17 00:00:00 2001 From: junxiawang Date: Wed, 26 Apr 2017 03:28:50 -0400 Subject: [PATCH 2/2] docker version updated and the output for docker command changed so modify the testcase --- xCAT-test/autotest/testcase/dockercommand/cases0 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xCAT-test/autotest/testcase/dockercommand/cases0 b/xCAT-test/autotest/testcase/dockercommand/cases0 index b87da9d35..e28c5d629 100644 --- a/xCAT-test/autotest/testcase/dockercommand/cases0 +++ b/xCAT-test/autotest/testcase/dockercommand/cases0 @@ -243,7 +243,8 @@ check:rc==0 cmd:rpower $$DOCKERCN start check:rc==0 cmd:rmdocker $$DOCKERCN -chec:rc!=0 +check:rc!=0 +check:output=~Stop the container cmd:rmdocker $$DOCKERCN -f check:rc==0 check:output=~$$DOCKERCN: success