p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
17,391 Commits 2 Branches 295 Tags
85cfba650a443dbd09b87f20cbc6bef554b0804e
Commit Graph

17 Commits

Author SHA1 Message Date
David Calavera
26753acfcd Keep backwards compatibility in kill api. 
Return an error when the container is stopped only in api versions
equal or greater than 1.20 (docker 1.8).

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 621e3d8587bbee86b4e36d0b7822662bfbedd76c
Component: engine
 2015-07-28 12:25:36 -07:00
Brian Goff
6e14356132 Don't pass check.C to dockerCmdWithError 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 693ba98cb9118bf15caaabc69ca281c0ce604226
Component: engine
 2015-07-27 14:33:32 -04:00
Qiang Huang
0b00c6ae1a dockerCmd when possible 
Addresses: #14603

integration-cli/docker_cli_daemon_experimental_test.go (hqhq)
integration-cli/docker_cli_daemon_test.go (hqhq)
integration-cli/docker_cli_diff_test.go (hqhq)
integration-cli/docker_cli_events_test.go (hqhq)
integration-cli/docker_cli_events_unix_test.go (hqhq)
integration-cli/docker_cli_exec_test.go (hqhq)
integration-cli/docker_cli_exec_unix_test.go (hqhq)
integration-cli/docker_cli_experimental_test.go (hqhq)
integration-cli/docker_cli_export_import_test.go (hqhq)
integration-cli/docker_cli_help_test.go (hqhq)
integration-cli/docker_cli_history_test.go (hqhq)
integration-cli/docker_cli_images_test.go (hqhq)
integration-cli/docker_cli_import_test.go (hqhq)
integration-cli/docker_cli_info_test.go (hqhq)
integration-cli/docker_cli_inspect_test.go (hqhq)
integration-cli/docker_cli_kill_test.go (hqhq)

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 668e2369cc5d57d634d0e559241ea4c4cbde65d8
Component: engine
 2015-07-20 14:55:40 +08:00
Doug Davis
85a6cd6efb Merge pull request #12371 from rhatdan/kill 
docker kill should return error if container is not running.
Upstream-commit: 46af724e81fe6890dc2709101e3c3f680db77631
Component: engine
 2015-06-10 08:32:57 -07:00
Antonio Murdaca
66c03ea423 Fix wrong kill signal parsing 
Signed-off-by: Antonio Murdaca <antonio.murdaca@gmail.com>
Upstream-commit: 39eec4c25bce6291534f9524dc52de65787d5b6e
Component: engine
 2015-06-02 18:01:19 +02:00
Dan Walsh
732b15e4ad Merge branch 'master' of github.com:docker/docker into kill 
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 35a7f0c59ec4de748a8038a3ba45f8a17021e5ef
Component: engine
 2015-05-27 16:37:32 -04:00
Dan Walsh
3c23cb903e Merge branch 'master' of github.com:docker/docker into kill 
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 66121d1b45253eb7292ee39fa50b2564dec85803
Component: engine
 2015-05-27 11:00:12 -04:00
Lorenzo Fontana
e61b33bc5e Removed deleteContainer calls 
Signed-off-by: Lorenzo Fontana <fontanalorenzo@me.com>
Upstream-commit: 086b514f6afb1eacc0683baa3472c80022f6e7e2
Component: engine
 2015-05-20 08:38:23 +02:00
Antonio Murdaca
2a80100987 Clean tests from not needed inspect call 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: a268e36719e38b91a4ece84e3fdb742ed36feac3
Component: engine
 2015-05-16 18:12:54 +02:00
Regan McCooey
5ec578ef0b docker kill should return error if container is not running. 
Assuming that docker kill is trying to actually kill the container
is a mistake.  If the container is not running we should report it
back to the caller as a error.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Docker-DCO-1.1-Signed-off-by: Regan McCooey <rmccooey27@aol.com> (github: rmccooey27)

Docker-DCO-1.1-Signed-off-by: Regan McCooey <rmccooey27@aol.com> (github: rhatdan)
Upstream-commit: c92377e300d2e9863ffa8eda9c3166a039b60e09
Component: engine
 2015-04-24 08:33:21 -04:00
Alexander Morozov
1884ef3b9b Use suite for integration-cli 
It prints test name and duration for each test.
Also performs deleteAllContainers after each test.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: dc944ea7e48d11a2906e751d3e61daf08faee054
Component: engine
 2015-04-21 10:28:52 -07:00
Todd Whiteman
cb9c496f89 fix #12188 integration-cli: tests using "sleep" can timeout too early - change to "top" instead 
Signed-off-by: Todd Whiteman <todd.whiteman@joyent.com>
Upstream-commit: 42d47c31367d288c7a9ae3acff635e995254469c
Component: engine
 2015-04-09 10:46:57 -07:00
Brian Goff
ab9a366f0e Remove stripTrailingCharacters from tests 
This was just an alias to `strings.TrimSpace`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 475c65319b4663d630711519e18d0b134c42c7f1
Component: engine
 2015-04-06 09:21:18 -04:00
Jessica Frazelle
3fda727482 Cleanup errorOut resp in kill test 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 0faf87598f19bd3520704ed18209afbbe6a6ee90
Component: engine
 2014-10-16 15:05:00 -07:00
Victor Vieux
e59ed0e9b1 move TestKillDifferentUser 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: eb9379c5d05848c525f7c3d75b66a4b356227d57
Component: engine
 2014-08-27 23:34:37 +00:00
unclejack
375b426ef6 cli integration: sync container & image deletion 
This makes container and image removal in the tests run synchronously.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: e09274476f889c08416a819dfb28f2c425868c6b
Component: engine
 2014-04-04 03:22:32 +03:00
unclejack
624997be0f initial version of cli integration tests 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 6db32fdefdae49843ed9535b3af1099e6bd2755d
Component: engine
 2014-03-29 23:09:40 +02:00