a97ff526a8
Merge pull request #16784 from MHBauer/test-refactor
...
use gocheck asserts instead of fatal
Upstream-commit: 48fe12af0c785d62ac852ea8428a9789a4e9d7fd
Component: engine
2015-10-22 08:34:50 +02:00
04eb439359
Use checker on integration test when possible
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: 710817a71b40287acc546fe2e08367b2a02dae54
Component: engine
2015-10-22 15:53:17 +08:00
dc90c0567e
Merge pull request #16908 from brahmaroutu/skip_oom_gccgo
...
Skipping two tests when running with GCCGO (CI)
Upstream-commit: bf8ba3d0c970c53890924bd1bf65cb593329df6f
Component: engine
2015-10-21 14:01:59 -07:00
533bd1241f
Merge pull request #16890 from runcom/perf-boost
...
rmi and build cache miss performance improvements
Upstream-commit: 56ef47e881359776638903ef1636cb7030ca5eec
Component: engine
2015-10-21 16:00:25 -04:00
4a8a97b06e
Merge pull request #17218 from vdemeester/17023-network-multiple-inspect
...
Add support for multiple network in inspect
Upstream-commit: 9f031f70ce832a5f3fde7bd902e66abeb44f19a9
Component: engine
2015-10-21 11:09:02 -07:00
91b1ec8aba
Merge pull request #16940 from coolljt0725/default_tls_host
...
Make default tls host work
Upstream-commit: 6a7c38a57d865afc89e4d6ec388bae3b9bedb870
Component: engine
2015-10-21 14:02:22 -04:00
e3fa9b6aba
Skipping two tests when running with GCCGO (CI)
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: dc813c7d137d3e673b68ad4a2996f254d195f1d9
Component: engine
2015-10-21 17:53:59 +00:00
6672204b41
Merge pull request #17136 from gesellix/change-route-volume-create
...
rename `POST /volumes` to `POST /volumes/create`
Upstream-commit: 492945235b6be7f2f7ff8721de0c01a93d0b0f6f
Component: engine
2015-10-21 10:21:27 -07:00
b1184809c8
Merge pull request #17229 from mavenugo/ds_fix
...
Fixing bootup inconsistencies due to invalid cluster-store config
Upstream-commit: bb5551746bdccc1b032fbf8c32914c282ff94668
Component: engine
2015-10-21 12:00:07 -04:00
efb4544862
graph: ensure _tmp dir is always removed
...
Also remove unused func `newTempFile` and prevent a possible deadlock
between pull_v2 `attemptIDReuse` and graph `register`
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: f6577be1c93150149c291f9d18375d7bcae9ebb1
Component: engine
2015-10-21 17:13:45 +02:00
d7d07ab148
graph: add parent img refcount for faster rmi
...
also fix a typo in pkg/truncindex package comment
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 56f5e3459f8d7477d2aa60dee02bc7cd8a8731ad
Component: engine
2015-10-21 17:13:45 +02:00
f13bda05a2
integration-cli: docker_cli_build_test: check error before defer
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 04ef69a1e963e0c9bc9b685188f2c584ef275e45
Component: engine
2015-10-21 17:13:45 +02:00
9086b77304
Add support for multiple network in inspect
...
To be consistent with other inspect command (on container and images),
add the possiblity to pass multiple network to the network inspect
commands.
`docker network inspect host bridge none` is possible now.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 7af9f988ac535e4ae2e87976db25d4f7047274db
Component: engine
2015-10-21 08:57:29 +02:00
c3f438b95a
Integration test for default bridge init with invalid cluster config
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 37627427a2ad9dcb06a2a6ea958670683a6c7934
Component: engine
2015-10-20 19:56:59 -07:00
a8c08d4980
Merge pull request #17202 from aboch/ipa
...
Do not mask ipam driver if no ip config is passed
Upstream-commit: 78e21679761c4aa2ea6b1254bf66525088ff0460
Component: engine
2015-10-20 19:45:08 -04:00
834dc8ee1e
Merge pull request #17177 from runcom/bc-fixes
...
Return empty Config fields, now omitempty, for API < 1.21
Upstream-commit: c516aa645ee407c4b67033b20fcf5c2849b98f21
Component: engine
2015-10-20 16:39:53 -04:00
988eb3b3bf
Do not mask ipam driver if no ip config is passed
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 27f908a051eb835c7cab59e596b8dee7ca92873b
Component: engine
2015-10-20 11:19:37 -07:00
e65f97a6f3
Merge pull request #16917 from WeiZhang555/start-inte
...
use of checkers on `integration-cli/docker_cli_start_test.go`
Upstream-commit: b7fcc71a3c1d63be6f1133d02b29f6298c4f02ff
Component: engine
2015-10-20 19:51:15 +02:00
ccde1983ec
Update Dockerfile to use the correct busybox:latest identifier
...
Also requires some tests to be updated which relied on behavior
of a busybox image that wasn't actually "busybox:latest"; meaning these
tests were unable to be verified/run against a real busybox:latest image
on a daemon.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 414cfe946719a0ba811c95486d523e003d44fcc1
Component: engine
2015-10-20 12:03:11 -04:00
acccf55db2
use of checkers on Integration test
...
Part of #16756
Use c.Assert instead of condition judgement in
integration-cli/docker_cli_start_test.go
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 08944cdef7397752a686ea800e110a8fa14ce719
Component: engine
2015-10-20 23:07:33 +08:00
348b7977d8
Merge pull request #17196 from liaoqingwei/16756-docker_cli_info_test
...
Use of checkers on docker_cli_info_test.go
Upstream-commit: aa8abf637ad1a2ccd44208ee0d59b24635c71555
Component: engine
2015-10-20 10:48:20 -04:00
cd977f222f
Merge pull request #17052 from echo33/docker_cli_start_volume_driver_unix_test
...
use of checkers on docker_cli_start_volume_driver_unix_test.go
Upstream-commit: 89bfbb15162d3745cc871addcd74b2e5f464cfb9
Component: engine
2015-10-20 07:21:28 -04:00
08d2bcc589
Use of checkers on docker_cli_info_test.go.
...
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com >
Upstream-commit: 37b3cd421fcad5513f22a27983167895f4a6cc8d
Component: engine
2015-10-20 13:38:55 +08:00
d8e401cd76
use gocheck asserts instead of fatal
...
- for #16756
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
Upstream-commit: eedeeaf49c49cc75ab30a01676736637224ddd8a
Component: engine
2015-10-19 12:30:22 -07:00
372d5d880d
Return empty Config fields, now omitempty, for API < 1.21
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 850bc0838a509d220bc78e47aa8203420aca22eb
Component: engine
2015-10-19 19:09:36 +02:00
f37af18747
Merge pull request #17115 from mountkin/tag-on-build
...
Proposal: emit a "tag" event when building image with "-t" parameter
Upstream-commit: e62fd33d963cdba947a9ef5abe100a9d85c58f24
Component: engine
2015-10-19 12:35:58 -04:00
6f63293742
Merge pull request #16854 from WeiZhang555/inte-test
...
use of checkers on `integration-cli/docker_cli_links_test.go` and `integration-cli/docker_cli_links_unix_test.go`
Upstream-commit: df15523745756f2837b436f35621ae16e624fd86
Component: engine
2015-10-19 12:10:31 -04:00
35d6e8b916
Fix TestInspectInt64 for run scenarios that return warnings
...
Instead of returning only the container ID, starting a container may
also return a warning:
"WARNING: Your kernel does not support swap
limit capabilities, memory limited without
swap.\nff6ebd9f7a8d035d17bb9a61eb9d3f0a5d563160cc43471a9d7ac9f71945d061"
The test assumes that only the container ID is returned and uses the
entire message as the name for the inspect command. To avoid the need to
parse the container ID from the output after the run command, give the
container a name and use that instead.
Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com >
Upstream-commit: ae29bd435bafad06f4701c4fbdf6aa8e106409e3
Component: engine
2015-10-19 08:56:32 -05:00
f833d205f0
Make default tls host work
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: fbb01b816288c5cf3eb79358c035072766b6e0f0
Component: engine
2015-10-19 21:17:37 +08:00
9688b9f21e
Merge pull request #17166 from echo33/docker_cli_diff_test
...
use of checkers on docker_cli_diff_test.go
Upstream-commit: 1f9557ac66740fa4c722f0d80e2d8e00b0ca6b5f
Component: engine
2015-10-19 08:25:32 -04:00
eb8940de3d
Merge pull request #17167 from liaoqingwei/16756-docker_cli_inspect_experimental_test.go
...
Use of checkers on docker_cli_inspect_experimental_test.go
Upstream-commit: 1c783567c06e52288bbff73168ee3596e2d357e7
Component: engine
2015-10-19 08:21:17 -04:00
12d92cfae8
emit a "tag" event when building image with "-t" parameter
...
This is useful for cluster systems such as swarm to sync the image
state when new images are successfully built.
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: 2968fa44eb2a53c121ad2b27c519ae47ca7653c3
Component: engine
2015-10-19 20:09:14 +08:00
07d916aab1
Use of checkers on docker_cli_inspect_experimental_test.go.
...
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com >
Upstream-commit: f3b2b8700f63654ff5c361dedfcf539eb6ee9ef6
Component: engine
2015-10-19 19:44:04 +08:00
2317835b8a
use of checkers on docker_cli_start_volume_driver_unix_test.go
...
Signed-off-by: weiyan <weiyan3@huawei.com >
Upstream-commit: a91a874f73ac8da43b76d142c79bd68447afd9bf
Component: engine
2015-10-19 19:19:57 +08: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
8f92947edf
Merge pull request #16897 from sunyuan3/docker_cli_rm_test
...
use of checkers on docker_cli_rm_test.go
Upstream-commit: eaa1fc41c6cbdf589831d607e86e0ee38c2d053f
Component: engine
2015-10-19 09:14:23 +02:00
a835b763db
Merge pull request #17162 from echo33/docker_cli_exec_unix_test
...
use of checkers on docker_cli_exec_unix_test.go
Upstream-commit: cfdb954303d031b85847483765b2ca98fc8d3f79
Component: engine
2015-10-19 08:54:42 +02:00
e8502d163c
use of checkers on docker_cli_exec_unix_test.go
...
Signed-off-by: weiyan <weiyan3@huawei.com >
Upstream-commit: d65ac42ca8ca368e0e6dc5ec9a26f8ec13b98ef4
Component: engine
2015-10-19 15:14:59 +08:00
91f3592865
use of checkers on docker_cli_rm_test.go
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: 0780ddc498f093cec67edd358e00add82c5efd5a
Component: engine
2015-10-19 10:42:56 +08:00
a455baadf1
Merge pull request #17008 from liaoqingwei/dev1
...
Update testcases: use of checkers on docker_cli_nat_test.go
Upstream-commit: bece5b82a89081816bc622d3c3e9178251013636
Component: engine
2015-10-18 18:11:02 +02:00
f9537ab059
Use of checkers on docker_cli_nat_test.go.
...
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com >
Upstream-commit: 26ae6d6b36a40a42706e149a6d1c30c27b5b3355
Component: engine
2015-10-18 20:02:55 +08:00
1d5c5cbb78
use of checkers on Integration test
...
Part of #16756
Use c.Assert instead of condition judgement.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 97b9223a1f49e706929603a91f56a48b935ad966
Component: engine
2015-10-18 09:00:08 +08:00
c93afd4f9e
Merge pull request #17056 from vdemeester/16756-integration-cli-checkers-api-build
...
Vendoring new go-check checkers and use checker for docker_api_build_test.go
Upstream-commit: cffd50752c2b2243519193a4ca458156291eb8af
Component: engine
2015-10-17 08:50:51 -07:00
0c3c684555
Use checker assert for docker_api_build_test.go
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 253f975fdbc13bc8a84fba1a3f8a4e518cb86d8e
Component: engine
2015-10-17 14:28:13 +02:00
4a78d859fe
rename POST /volumes to POST /volumes/create to be consistent with the other POST /.../create endpoints
...
see #17132
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de >
Upstream-commit: 0c95eeb584f5033e1f1cc8eb383306b87d3f133f
Component: engine
2015-10-17 14:13:40 +02:00
17e4fec1fd
Merge pull request #16871 from ZJU-SEL/fix_version_test
...
update docker_cli_version_test.go
Upstream-commit: 9b1fb0d45b09f72e368e4f5d025ea592ee002007
Component: engine
2015-10-17 08:02:18 -04:00
2c49af742a
Merge pull request #17113 from mountkin/validate-filter
...
make sure the value of the dangling filter is correct
Upstream-commit: c3f42b29a805e41a1e518653a1855c4e2a7f8d43
Component: engine
2015-10-16 16:32:11 -07:00
f246159061
Merge pull request #17046 from mavenugo/dopts
...
driver-opts for network create
Upstream-commit: 365a0db0f0f105306a8553405fb68a207e8d7754
Component: engine
2015-10-16 15:23:59 -07:00
a13a9840ca
Merge pull request #16901 from WeiZhang555/rmi-inte
...
Update integration test `integration-cli/docker_cli_rmi_test.go` with Assert
Upstream-commit: ec7c368ff01e2e79cb26a5afa2d2c7291cc1472d
Component: engine
2015-10-16 15:23:00 -07:00
08f3a405bd
Merge pull request #16977 from mountkin/refactor-test
...
refactor integration test to use checkers
Upstream-commit: d8b4471a593f55a06ec77e6b3e8215a20b3f0f5f
Component: engine
2015-10-17 00:22:03 +02:00
