summaryrefslogtreecommitdiff
path: root/integration-cli/docker_cli_commit_test.go
Commit message (Collapse)AuthorAgeFilesLines
* Vendor engine-api to 70d266e96080e3c3d63c55a4d8659e00ac1f7e6cQiang Huang2016-02-291-2/+2
| | | | Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
* Assert error in body of function `inspectField*`Zhang Wei2016-01-291-8/+4
| | | | | | | | | 1. Replace raw `docker inspect -f xxx` with `inspectField`, to make code cleaner and more consistent 2. assert the error in function `inspectField*` so we don't need to assert the return value of it every time, this will make inspect easier. Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
* Checkers on integration-cli/docker_cli_commit_testAditi Rajagopal2015-10-291-49/+23
| | | | | | Applying #16756 to integration-cli/docker_cli_commit_test.go Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
* Windows: Get Integration CLI runningJohn Howard2015-09-041-5/+9
| | | | Signed-off-by: John Howard <jhoward@microsoft.com>
* Use dockerCmd when possible (#14603)Vincent Demeester2015-07-141-123/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | - integration-cli/docker_cli_attach_test.go - integration-cli/docker_cli_attach_unix_test.go - integration-cli/docker_cli_build_test.go - integration-cli/docker_cli_build_unix_test.go - integration-cli/docker_cli_by_digest_test.go - integration-cli/docker_cli_commit_test.go - integration-cli/docker_cli_config_test.go - integration-cli/docker_cli_cp_test.go - integration-cli/docker_cli_create_test.go - integration-cli/docker_cli_pause_test.go - integration-cli/docker_cli_port_test.go - integration-cli/docker_cli_port_unix_test.go - integration-cli/docker_cli_proxy_test.go - integration-cli/docker_cli_ps_test.go - integration-cli/docker_cli_pull_test.go - integration-cli/docker_cli_push_test.go - docker_api_attach_test.go - docker_api_containers_test.go - docker_api_events_test.go - docker_api_exec_resize_test.go - docker_api_exec_test.go - docker_api_images_test.go - docker_api_info_test.go Signed-off-by: Vincent Demeester <vincent@sbr.pm>
* just adding label to whitelist for commit command (Fixes #13738)Tom Howe2015-06-161-0/+14
| | | | Signed-off-by: Tom Howe <turtlebender@gmail.com>
* Use inspectField to simplify codeQiang Huang2015-05-181-10/+3
| | | | Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
* trivial: typo cleanupDavid Mackey2015-04-271-1/+1
| | | | Signed-off-by: David Mackey <tdmackey@booleanhaiku.com>
* Implement teardown removeAllImagesAlexander Morozov2015-04-241-16/+0
| | | | Signed-off-by: Alexander Morozov <lk4d4@docker.com>
* Allow go template to work properly with inspectSrini Brahmaroutu2015-04-231-1/+1
| | | | | | Closes #11641 Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
* Use suite for integration-cliAlexander Morozov2015-04-211-65/+50
| | | | | | | It prints test name and duration for each test. Also performs deleteAllContainers after each test. Signed-off-by: Alexander Morozov <lk4d4@docker.com>
* Removed unnecessary error output from dockerCmdbobby abbott2015-04-171-2/+2
| | | | | | | | | Changed method declaration. Fixed all calls to dockerCmd method to reflect the change. resolves #12355 Signed-off-by: bobby abbott <ttobbaybbob@gmail.com>
* Move TestMergeOnCommit to integration-cliBrian Goff2015-04-131-0/+50
| | | | Signed-off-by: Brian Goff <cpuguy83@gmail.com>
* Remove `stripTrailingCharacters` from testsBrian Goff2015-04-061-6/+6
| | | | | | This was just an alias to `strings.TrimSpace` Signed-off-by: Brian Goff <cpuguy83@gmail.com>
* integ-cli: fix TestCommitChange for pulled busyboxAhmet Alp Balkan2015-02-261-1/+2
| | | | | | | | | | | | | | | | | | If the tests are running outside a container (i.e. executed without `make test`), we are using a `busybox` pulled from Docker Hub (not jpatezzo's docker-busybox). That one adds an extra `PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin` env var all the time and that messes the test `TestCommitChange`. That's currently breaking the windows CI. I'm keeping the same PATH here but making it explicit so that it's always set and we verify what we set. It's actually the same thing if I set `ENV PATH foo` here but I thought it may lead to some problems hard to debug in the future. Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
* Merge pull request #9123 from rhatdan/commit-changeTibor Vass2015-02-241-0/+38
|\ | | | | Patch to commit-change patch to add docker import support
| * I am only seeing the values I setDan Walsh2015-02-241-1/+2
| | | | | | | | Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
| * pass --change changes to the import jobDan Walsh2015-02-241-2/+6
| | | | | | | | Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
| * support `changes` in commit jobDaniel, Dao Quang Minh2015-02-241-0/+33
| | | | | | | | | | | | | | | | | | | | | | In addition to config env, `commit` now will also accepts a `changes` env which is a string contains new-line separated Dockerfile instructions. `commit` will evaluate `changes` into `runconfig.Config` and merge it with `config` env, and then finally commit a new image with the changed config Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh) Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: rhatdan)
* | Fix docker commit make a paused container to unpaused. Closes #10932Lei Jitang2015-02-241-0/+38
|/ | | | Signed-off-by: Lei Jitang <leijitang@huawei.com>
* Better test cleanup with deferAhmet Alp Balkan2015-02-201-9/+9
| | | | | | | | | | | This fixes a few misuses of `deleteAllContainers()` cleanup method in integration-cli suite by moving call to the beginning of the method and guaranteeing their execution (including panics) with `defer`s. Also added some forgotten cleanup calls while I'm at it. Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
* Make sure integration-cli test clean upTonis Tiigi2014-11-191-0/+3
| | | | | | | | Common patterns: - Multiple images were built with same name but only one cleanup. - Containers were deleted after images. - Images not removed after retagging. Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com> (github: tonistiigi)
* archive: preserve hardlinks in Tar and UntarVincent Batts2014-10-291-0/+52
| | | | | | | * integration test for preserving hardlinks Signed-off-by: Vincent Batts <vbatts@redhat.com> Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
* Cleanup errorOut resp in commit testJessica Frazelle2014-10-161-16/+26
| | | | | | | | Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle) Cleanup errorOut resp in commit test Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
* integcli: lint fixesunclejack2014-10-061-10/+10
| | | | Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
* Split volumes out from daemonBrian Goff2014-09-191-1/+1
| | | | Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
* Add logDone logs where it's missingAlexandr Morozov2014-08-281-0/+2
| | | | Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
* updated docs & testsVictor Vieux2014-07-011-2/+2
| | | | Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
* Pause/freeze containers during commitEric Windisch2014-07-011-0/+27
| | | | | | | | | | Initiates a pause before committing a container, adds a pause option to the commit command, defaulting to 'true'. Fixes bug: #6267 Fixes bug: #3675 Docker-DCO-1.1-Signed-off-by: Eric Windisch <ewindisch@docker.com> (github: ewindisch)
* Add test for commiting container with bind mountMichael Crosby2014-05-191-0/+25
| | | | Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
* do not merge -i or -t optionsVictor Vieux2014-05-161-0/+21
| | | | Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
* Update commit test in cliMichael Crosby2014-04-181-0/+30
| | | | Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
* cli integration: sync container & image deletionunclejack2014-04-041-2/+2
| | | | | | 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)
* initial version of cli integration testsunclejack2014-03-291-0/+34
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)