cfcd7a95da
migrated service integration tests from integration-cli/docker_cli_service_update_test.go to integration/service
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: fbaef1b0d3c5656a8aa5f0424b89c118ca277427
Component: engine
2018-07-25 14:49:02 -04:00
6f81e7d4d9
Merge pull request #37483 from thaJeztah/fix-nit-pick
...
Use constant for task runtime value
Upstream-commit: cc7cda1968062fc6dde28c93e85a0192d58b6d90
Component: engine
2018-07-18 17:31:44 +02:00
58b60f8a46
Use constant for task runtime value
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 2b7d34977e72054d197a481a10addd773aa23ca4
Component: engine
2018-07-17 20:41:25 +02:00
bb64046f90
Fix flaky TestExternalGraphDriver/pull test
...
This test occassionally fails on s390x and Power;
03:16:04 --- FAIL: TestExternalGraphDriver/pull (1.08s)
03:16:04 external_test.go:402: assertion failed: error is not nil: Error: No such image: busybox:latest
Most likely these failures are caused due to Docker Hub updating
the busybox:latest image, but not all architectures yet being
available.
Instead of using `:latest`, pull an image by digest, so that
the test doesn't depend on Docker Hub having all architectures
available for `:latest`.
I selected the same digest as is currently used as "frozen image"
in the Dockerfile.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 352db26d5fd896b681046b1119f07e0ce1ed45b8
Component: engine
2018-07-17 10:45:33 +02:00
14ed98c1a4
moved integration tests from docker_cli_config_create_test.go to integration/config
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 0e57ceae0dd42491ed81538bf4d9164218080b66
Component: engine
2018-07-13 17:29:02 -04:00
d799a9b46d
Fix golint issues
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 35f7e7c50a131494c9d530800e80bf2da42fb89c
Component: engine
2018-07-11 22:19:03 +02:00
bf53bc318d
Migrate some ipcmode tests to integration
...
This fix migrates some ipcmode tests in integration-cli
to integration tests.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: e0403604e26868b1546a766ab0b40b6cb1677ee6
Component: engine
2018-07-04 16:32:18 +00:00
b383c8f747
Merge pull request #37351 from LotusFenn/unique-names-network-service-test
...
Use unique names in integration/network/service_test.go
Upstream-commit: 8f709d894811ec22b621a77fcc0e69476318d7f2
Component: engine
2018-06-27 20:32:20 +09:00
bc8dee16e5
add unique names to integration/network/service_test.go
...
Signed-off-by: Lotus Fenn <fenn.lotus@gmail.com >
Upstream-commit: f94c97d3200ec11762fc3fb3c2eafd5866ffa976
Component: engine
2018-06-27 00:56:52 -07:00
840124a196
refactored integration/service/network integration tests to use network package
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 8b07ec58ea5792f906c006edc5db9f37c7a570de
Component: engine
2018-06-26 17:18:22 -04:00
3c9ebe0c45
Merge pull request #37293 from adshmh/migrate-TestNetworkCreateDelete-to-integration
...
migrate TestAPINetworkCreateDelete from integration-cli/ to integration/
Upstream-commit: af626ba08a4e11b0e140e7512ac2740b09833c29
Component: engine
2018-06-21 19:08:08 -07:00
28ecd8f494
refactor network inspect integration tests to use network package
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: dda4128c7ea6df5565e4ad3c0f0958a0aad547da
Component: engine
2018-06-21 09:44:52 -04:00
d5c5d1c094
refactored remaining macvlan integration tests to use network package for creating networks
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 1c923b28b81f22023ca8c562d359b9136efb93eb
Component: engine
2018-06-20 17:09:26 -04:00
f8d73bea7c
refactor ipvlan network integration tests to use network.Create
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 6fc9c7e5a9af409da932dfcd0847eaaf0e583111
Component: engine
2018-06-16 05:11:35 -04:00
79590fda36
migrate TestAPINetworkCreateDelete from integration-cli/ to integration/
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: f5426214295cb59d54ece5a24d4720e31947981b
Component: engine
2018-06-15 16:06:45 -04:00
1c5329a0c5
Merge pull request #37279 from adshmh/refactor-service-create-integration-tests-use-network-create
...
Create service integration tests use network package
Upstream-commit: 3f405c48fff297ae6ddeed58363b904d2d8e94f9
Component: engine
2018-06-14 12:57:48 +02:00
a53be8bf33
Merge pull request #37270 from adshmh/refactor-service-network-integration-tests-use-network-create
...
refactored service network integration tests to use the network package
Upstream-commit: d3d58b68c628edd138f3956614bffccfe81814a4
Component: engine
2018-06-13 13:11:31 -07:00
7cdcffc8da
create service integration tests use network package
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: ad46a1f5e7e82b882390c2974a52faa06c5b8cb2
Component: engine
2018-06-13 12:10:02 -04:00
4cadaa03f8
Update tests to use gotest.tools 👼
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 38457285242e57306c5b7ee652c7ccbb9fbd6713
Component: engine
2018-06-13 09:04:30 +02:00
2ba3b58b47
refactored network integration tests under integration/network/service_test.go to use network package
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 694047183a9f72b3b2b45ef09f27dc0776fa3e10
Component: engine
2018-06-12 14:31:01 -04:00
ec203c5bb5
refactor delete network integration tests to use network package
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 991d5121592eeb1e4442516f957ed484d8b687c7
Component: engine
2018-06-09 06:39:22 -04:00
885386e772
Merge pull request #37195 from adshmh/refactor-integration-test-create-network-calls-macvlan
...
Refactor macvlan network integration tests to use network.Create
Upstream-commit: 162ba6016def672690ee4a1f3978368853a1e149
Component: engine
2018-06-08 09:46:04 +02:00
cdee8f774a
Merge pull request #37183 from vdemeester/service-create-init
...
Add support for `init` on services
Upstream-commit: f11f24958852986cfc996e6076fed75bfcbf1ed1
Component: engine
2018-06-07 19:22:14 -07:00
a1a394884c
Merge pull request #37231 from adshmh/use-unique-names-for-integration-tests-service-create
...
use unique names for resources in create service integration tests
Upstream-commit: 5ff12f6ba13edf16a174250b65b1c7294fbd5a45
Component: engine
2018-06-07 17:47:07 -07:00
92d9a5ddfd
Merge pull request #37215 from adshmh/integration-container-links-tests-use-unique-names
...
container links integration tests use unique names
Upstream-commit: d47c45175b13e97475649dfe8b1ab1034c4865d0
Component: engine
2018-06-07 22:34:12 +02:00
29579f20f8
use unique names for resources in create service integration tests
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: d5ae23fc11b91275801dcab2326e803725a645a6
Component: engine
2018-06-07 12:11:11 -04:00
43d60463c2
Add support for init on services
...
It's already supported by `swarmkit`, and act the same as
`HostConfig.Init` on container creation.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: e401b88e59e098745744917c555d549f08353e6d
Component: engine
2018-06-07 14:17:55 +02:00
025606b2a1
Merge pull request #36644 from jessfraz/rawaccess
...
api: add MaskedPaths and ReadonlyPaths options
Upstream-commit: 1fe0e49d2057d5ee1b12cc6f53e4c41a197e7fec
Component: engine
2018-06-06 18:16:16 -07:00
9022898c18
integration tests under integration/container/links_linux_test.go use unique names
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 077247050df0bf97b7b62e439152eb362e9ec813
Component: engine
2018-06-06 06:14:24 -04:00
67fe100ad5
api: add configurable MaskedPaths and ReadOnlyPaths to the API
...
This adds MaskedPaths and ReadOnlyPaths options to HostConfig for containers so
that a user can override the default values.
When the value sent through the API is nil the default is used.
Otherwise the default is overridden.
Adds integration tests for MaskedPaths and ReadonlyPaths.
Signed-off-by: Jess Frazelle <acidburn@microsoft.com >
Upstream-commit: 3694c1e34e40fa2e255a97b5541645cec9c8d1d5
Component: engine
2018-06-05 12:33:14 -04:00
f422827dd4
refactored integration tests under integration/network/macvlan to use network.Create
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 0418893f0b5a7413edd950cfabd2337161edc705
Component: engine
2018-06-05 06:32:24 -04:00
8a3da41a28
Added network package to integration/internal to refactor integration tests calls to client.NetworkCreate
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 0e3012cfff1e81f7c779b1310f6069dc909d7987
Component: engine
2018-06-05 06:32:24 -04:00
60c800804e
Update containerd to 1.1
...
Updates swarmkit, grpc, and all related vendors
Signed-off-by: Derek McGowan <derek@mcgstyle.net >
Upstream-commit: 52ed3e0896c203013388a3eb603658f345a9d80a
Component: engine
2018-06-04 15:37:03 -07:00
94cab3b97b
Merge pull request #37191 from adshmh/use-unique-names-for-integration-tests-secret
...
use unique names for resources in integration tests of secret package
Upstream-commit: d7e94d6ea7c1a76c79b6da722491c79118236999
Component: engine
2018-06-05 00:06:50 +02:00
2f23577c7a
vendor: use dockerfile parser from buildkit
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: c9ebd2f13b3aab49c2d90cc38dcf2cd0d059697f
Component: engine
2018-06-02 11:10:34 -07:00
37acacf605
use unique names for resources in integration tests of integration/secret package
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: a70794aff0fc5a02db9c939397d663f174d2f726
Component: engine
2018-06-01 06:46:52 -04:00
98281f1a9c
fix the mis-used skip condition
...
Signed-off-by: Anda Xu <anda.xu@docker.com >
Upstream-commit: d8e6f273b5016880c5d49673ddf531ceecc2bc0d
Component: engine
2018-05-30 17:13:20 -07:00
ab001b0599
Merge pull request #37169 from AntaresS/add-version-checking
...
add api version checking for tests from new feature
Upstream-commit: 0a94468a5bed080a77a01847515123b9c2eff62e
Component: engine
2018-05-30 09:58:45 -10:00
75e47b0eb6
Merge pull request #36874 from kolyshkin/stop-timeout
...
daemon.ContainerStop(): fix for a negative timeout
Upstream-commit: b85799b63fb25423620ed16e717a99401cd3a39b
Component: engine
2018-05-30 13:38:42 -04:00
a99e1e1ff6
add api version checking for tests from new feature
...
Signed-off-by: Anda Xu <anda.xu@docker.com >
Upstream-commit: 8ed0fdebe714c64aa697ed7e2187d2233e34eb22
Component: engine
2018-05-29 15:25:33 -07:00
37672d40d5
Add t.Name() to tests so that service names are unique
...
This fix adds `t.Name()` to tests in integration/network
so that services created in those tests have unique names.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 76195f8047eb9a6be710d53ec493ab97bcf86e20
Component: engine
2018-05-28 22:57:52 +00:00
db35657a47
Adjust API version to match correct release
...
This fix was not yet included in Docker 17.05, so
API version v1.37 was not the right selector (Docker
18.03, 18.04 and 18.05 all support API v1.37).
We should change these checks for engine versions,
or use a different method to skip tests when running
against older engines.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: a061b1e2d8f6117b0524e44de7b6bc391245864e
Component: engine
2018-05-24 02:39:56 +02:00
0f96e98e12
Various code-cleanup
...
remove unnescessary import aliases, brackets, and so on.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: f23c00d8701e4bd0f2372a586dacbf66a26f9a51
Component: engine
2018-05-23 17:50:54 +02:00
6280cae03a
skip feature/test added that is breaking ee
...
Signed-off-by: Anda Xu <anda.xu@docker.com >
Upstream-commit: 84598be35f200bd0ea28a615100c51dbaeb51898
Component: engine
2018-05-22 17:42:41 -07:00
717e3937b9
more fixes on integration
...
Signed-off-by: Anda Xu <anda.xu@docker.com >
Upstream-commit: b9b4f888703a20ddd7670c1b978dcb1621fa210f
Component: engine
2018-05-22 11:25:25 -07:00
b21cab8bb2
Merge pull request #37110 from thaJeztah/remove-testutil-errorcontains
...
Replace deprecated testutil.ErrorContains()
Upstream-commit: 9bd5d9912f0cb4fe22b994ac1e7e10038e3be65a
Component: engine
2018-05-21 11:04:45 -07:00
b179a3fc0d
Some slight tweaks for the integration test
...
`arm64` needs get more time duration for the test to finish.
`pty.Start()` opens a file, so the caller should close it explicitly,
else the file I/O can result in unexpected data synchronization issue.
All those changes will not affect the test itself.
Signed-off-by: Dennis Chen <dennis.chen@arm.com >
Upstream-commit: 476d7872efb60b1ef1bc7d9d83952f9dbc8f8798
Component: engine
2018-05-21 10:08:27 +08:00
659852c34d
Merge pull request #37011 from arm64b/ReAdd-LABEL-command-4-target-option
...
Construct and add 'LABEL' command from 'label' option to last stage
Upstream-commit: 8974fd47c7677b21c43597709655136addadb864
Component: engine
2018-05-21 00:15:02 +02:00
fac8e1d52b
Replace deprecated testutil.ErrorContains()
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 55bebbaecf5e40db9d83b28080ce08dc8642f407
Component: engine
2018-05-21 00:13:04 +02:00
7f78f7fe15
Fix some linting issues
...
These showed locally when running `make validate`. CI doesn't seem to have the
same (possibly it's disabled in the configuration)
builder/fscache/fscache.go:618::error: github.com/docker/docker/vendor/github.com/tonistiigi/fsutil.StatInfo composite literal uses unkeyed fields (vet)
client/swarm_unlock_test.go:44::error: github.com/docker/docker/api/types/swarm.UnlockRequest composite literal uses unkeyed fields (vet)
client/swarm_unlock_test.go:20::error: github.com/docker/docker/api/types/swarm.UnlockRequest composite literal uses unkeyed fields (vet)
cmd/dockerd/daemon_unix.go:113::error: github.com/docker/docker/cmd/dockerd/hack.MalformedHostHeaderOverride composite literal uses unkeyed fields (vet)
cmd/dockerd/daemon_unix.go:110::error: github.com/docker/docker/cmd/dockerd/hack.MalformedHostHeaderOverride composite literal uses unkeyed fields (vet)
daemon/graphdriver/overlay/overlay.go:171::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
daemon/graphdriver/overlay/overlay.go:413::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
daemon/graphdriver/overlay2/overlay.go:203::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
daemon/graphdriver/overlay2/overlay.go:584::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
daemon/graphdriver/zfs/zfs.go:109::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
daemon/graphdriver/zfs/zfs.go:388::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
daemon/volumes_windows.go:27::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
integration/service/network_test.go:31::error: github.com/docker/docker/api/types/network.NetworkingConfig composite literal uses unkeyed fields (vet)
api/server/server.go:129:10⚠️ should not use basic type string as key in context.WithValue (golint)
integration/service/network_test.go:54::error: github.com/docker/docker/api/types/network.NetworkingConfig composite literal uses unkeyed fields (vet)
libcontainerd/client_daemon_linux.go:61::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
libcontainerd/client_daemon_linux.go:74::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
pkg/archive/archive_windows.go:76::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
plugin/manager_linux.go:56::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 4f8c870d623c63b98f8ef8002448f07f4dda4aa9
Component: engine
2018-05-17 19:28:27 +02:00
