Commit Graph

22 Commits

Author SHA1 Message Date
b9600bdf73 Fix TestDiffEmptyArgClientError O:)
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 7878705dcc26804b5f6a562410aecdb8f3485b91
Component: engine
2016-06-06 13:58:29 +02:00
9c145d0655 Use spf13/cobra for docker diff
This fix is part of the effort to convert commands to spf13/cobra #23211.

Thif fix coverted command `docker diff` to use spf13/cobra

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 5899afae52b10d2457848c6e62a7476835befef3
Component: engine
2016-06-05 15:13:55 -07:00
068d11d990 integration-cli: fix wrong test and add log
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: e73152bf273418cbee3d5862dd2ccfbdf2d6e8fc
Component: engine
2016-03-24 11:10:41 +01:00
4edafc3bc1 *: purge dockerinit from source code
dockerinit has been around for a very long time. It was originally used
as a way for us to do configuration for LXC containers once the
container had started. LXC is no longer supported, and /.dockerinit has
been dead code for quite a while. This removes all code and references
in code to dockerinit.

Signed-off-by: Aleksa Sarai <asarai@suse.com>
Upstream-commit: 4357ed4a7363a1032edf93cf03232953c805184f
Component: engine
2016-01-26 23:47:02 +11:00
ef88e7ace2 Remove LXC support.
The LXC driver was deprecated in Docker 1.8.
Following the deprecation rules, we can remove a deprecated feature
after two major releases. LXC won't be supported anymore starting on Docker 1.10.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 3b5fac462d21ca164b3778647420016315289034
Component: engine
2015-11-05 17:09:57 -05:00
0b8125559d use of checkers on docker_cli_diff_test.go
Signed-off-by: weiyan <weiyan3@huawei.com>
Upstream-commit: 7be79767c18a1643e9e8e9be1764f2c838152c0b
Component: engine
2015-10-19 19:07:59 +08:00
332d97bdef update tests
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 28ad7c588f5ebaf5a41950b42a61759cf47c8de7
Component: engine
2015-10-13 15:52:14 -07:00
c03ccb6893 Windows: Get Integration CLI running
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: f9a3558a9d75ed6a2f9f1b2d80800226afaa74a5
Component: engine
2015-09-04 12:32:40 -07:00
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
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
32f581b90b Add diff command with emtpy string testcase
Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: 9d84d4c2ccf92aa87d82ff82aedd177950951dbf
Component: engine
2015-07-09 18:46:38 +02:00
6b34bbbde8 fixed TestDiffEnsureDockerinitFilesAreIgnored is too long #12672
Signed-off-by: Daniel Antlinger <d.antlinger@gmx.at>
Upstream-commit: 50868b2c575c26492f4c49a79d2f3b51ec68a229
Component: engine
2015-04-27 13:24:15 -07:00
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
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
764888405b Fixes symlink, container size, and kmsg tests
Changes symlink, container size and kmsg tests to account for lxc driver.
Signed-off-by: Abin Shahab <ashahab@altiscale.com> (github: ashahab-altiscale)
Docker-DCO-1.1-Signed-off-by: Abin Shahab <ashahab@altiscale.com> (github: ashahab-altiscale)
Upstream-commit: 29ac29a4361e0392979ad6a99341bff174f76967
Component: engine
2015-01-30 09:30:42 +00:00
198fd58622 Cleanup errorOut resp in diff test
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: ac62c5439ac6197c3afca66db4489f96296097b6
Component: engine
2014-10-16 15:05:00 -07:00
5203b5e653 Replace '%s' in diff tests
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: a44296603f8188278241cc8d8a353952ee50ec54
Component: engine
2014-10-14 10:59:01 -07:00
def10d2ed4 Add logDone logs where it's missing
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 3c984a6d1578947c5adfe13993cb28d88a674bbf
Component: engine
2014-08-28 09:25:57 +04:00
d3e75544ad Fix sleep command in tests
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: 012091a28f8c2a96ad937f8c84992687e804ab71
Component: engine
2014-06-26 17:09:41 -07:00
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
25fa65216f add test
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: dcf2b72f5b6732a4b9b1897cb2b3f7019e3d547e
Component: engine
2014-04-01 21:07:40 +00:00
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