docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2199 from nathanleclaire/none_running 

Change default state of none driver to state.Running
This commit is contained in:
David Gageot 2015-11-06 07:59:49 +01:00
parent 34f818527d ac6a18ba25
commit 4ac76457f9
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/none/driver.go
View File

@ -71,7 +71,7 @@ func (d *Driver) GetURL() (string, error) {
}
func (d *Driver) GetState() (state.State, error) {
return state.None, nil
return state.Running, nil
}
func (d *Driver) Kill() error {

15
test/integration/cli/ls.bats
View File

@ -37,8 +37,9 @@ bootstrap_swarm () {
[[ ${lines[2]} == "testmachine3" ]]
}
@test "ls: filter on state 'machine ls --filter state=\"\"'" {
run machine ls --filter state=""
@test "ls: filter on state 'machine ls --filter state=\"Running\"'" {
# Default state for 'none' driver is "Running"
run machine ls --filter state="Running"
[ "$status" -eq 0 ]
[[ ${#lines[@]} == 4 ]]
[[ ${lines[1]} =~ "testmachine" ]]
@ -46,7 +47,7 @@ bootstrap_swarm () {
[[ ${lines[3]} =~ "testmachine3" ]]
# TODO: have machines in that state
run machine ls --filter state="Running"
run machine ls --filter state="None"
[ "$status" -eq 0 ]
[[ ${#lines[@]} == 1 ]]
run machine ls --filter state="Paused"
@ -69,8 +70,8 @@ bootstrap_swarm () {
[[ ${#lines[@]} == 1 ]]
}
@test "ls: filter on state 'machine ls -q --filter state=\"\"'" {
run machine ls -q --filter state=""
@test "ls: filter on state 'machine ls -q --filter state=\"Running\"'" {
run machine ls -q --filter state="Running"
[ "$status" -eq 0 ]
[[ ${#lines[@]} == 3 ]]
[[ ${lines[0]} == "testmachine" ]]
@ -130,9 +131,9 @@ bootstrap_swarm () {
[[ ${lines[2]} == "testswarm3" ]]
}
@test "ls: multi filter 'machine ls -q --filter swarm=testswarm --filter name=\"^t.*e\" --filter driver=none --filter state=\"\"'" {
@test "ls: multi filter 'machine ls -q --filter swarm=testswarm --filter name=\"^t.*e\" --filter driver=none --filter state=\"Running\"'" {
bootstrap_swarm
run machine ls -q --filter swarm=testswarm --filter name="^t.*e" --filter driver=none --filter state=""
run machine ls -q --filter swarm=testswarm --filter name="^t.*e" --filter driver=none --filter state="Running"
[ "$status" -eq 0 ]
[[ ${#lines[@]} == 3 ]]
[[ ${lines[0]} == "testswarm" ]]