xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-02 19:40:10 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2426 from junxiawang/0120

Browse Source 
modify docker test cases
This commit is contained in:
tingtli 2017-01-20 15:40:07 +08:00 committed by GitHub
commit d59e4f0029
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xCAT-test/autotest/testcase/dockercommand/cases0
View File

@ -122,7 +122,7 @@ cmd:mkdocker $$DOCKERCN image=$$DOCKERIMAGE command=$$DOCKERCOMMAND dockerflag=
check:rc==0
cmd:rpower $$DOCKERCN pause
check:rc!=0
check:output=~$$DOCKERCN: Error: Container
check:output=~$$DOCKERCN: Error
cmd:rpower $$DOCKERCN start
check:rc==0
cmd:rpower $$DOCKERCN pause
@ -223,7 +223,7 @@ cmd:rmdocker $$DOCKERCN
check:rc==0
cmd:lsdocker -l $$DOCKERCN
check:rc!=0
check:output=~ Error: No such container
check:output=~$$DOCKERCN: Error
cmd:makehosts -d $$DOCKERCN
check:rc==0
cmd:rmdef $$DOCKERCN

4
xCAT-test/autotest/testcase/installation/ubuntu_full_installation_vm_docker
View File

@ -25,7 +25,6 @@ check:rc==0
cmd:rpower $$CN boot
check:rc==0
cmd:sleep 900
cmd:a=0;while ! `lsdef -l $$CN|grep status|grep booted >/dev/null`; do sleep 10;((a++));if [ $a -gt 60 ];then break;fi done
cmd:ping $$CN -c 3
@ -38,7 +37,8 @@ check:rc==0
cmd:xdsh $$CN "docker -v"
check:output=~Docker version
check:rc==0
cmd:xdsh $$CN "docker pull $$DOCKERIMAGE"
cmd:a=0;while true; do [ $a -eq 100 ] && exit 1;xdsh $$CN "docker pull $$DOCKERIMAGE";output=$(xdsh $$CN "docker images");echo $output|grep $$DOCKERIMAGE 2>/dev/null && exit 0;a=$[$a+1];sleep 1;done
check:rc==0
cmd:rmdef -t osimage -o __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-dockerhost
check:rc==0