beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
44764 commits 14 branches 412 tags 338 MiB
Commit graph

94 commits

Author SHA1 Message Date
Vincent Demeester
c2e3657b17
Revert "migrated service integration tests from integration-cli/docker_cli_service_update_test.go to integration/service" 
This reverts commit fbaef1b0d3.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-07-27 17:35:52 +02:00
Arash Deshmeh
fbaef1b0d3 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>
 2018-07-25 14:49:02 -04:00
Sebastiaan van Stijn
2b7d34977e
Use constant for task runtime value 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-07-17 20:41:25 +02:00
Arash Deshmeh
8b07ec58ea refactored integration/service/network integration tests to use network package 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
 2018-06-26 17:18:22 -04:00
Arash Deshmeh
ad46a1f5e7 create service integration tests use network package 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
 2018-06-13 12:10:02 -04:00
Vincent Demeester
3845728524
Update tests to use gotest.tools 👼 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-06-13 09:04:30 +02:00
Sebastiaan van Stijn
f11f249588
Merge pull request #37183 from vdemeester/service-create-init 
Add support for `init` on services
 2018-06-07 19:22:14 -07:00
Arash Deshmeh
d5ae23fc11 use unique names for resources in create service integration tests 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
 2018-06-07 12:11:11 -04:00
Vincent Demeester
e401b88e59
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>
 2018-06-07 14:17:55 +02:00
Sebastiaan van Stijn
4f8c870d62
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>
 2018-05-17 19:28:27 +02:00
Vincent Demeester
829dcefa9d
Merge pull request #37044 from yongtang/03112018-TestDockerNetworkConnectAlias-name 
Avoid unique name usage in TestDockerNetworkConnectAlias
 2018-05-15 11:46:11 +02:00
Yong Tang
e7b5f4500d Avoid unique name usage in TestDockerNetworkConnectAlias 
In TestDockerNetworkConnectAlias the network and container
names used are unique which are not preferred. This
fix address the issue by appending t.Name() so that
names are randomized.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2018-05-14 16:59:13 +00:00
Arash Deshmeh
e9a687146a refactor integration tests under integration/service/create_test.go to use swarm.CreateService 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
 2018-05-10 05:45:49 -04:00
Vincent Demeester
ef2c2040c2 Skip some test on remote daemon for e2e run(s) 
We really need to run those on the CI too at some point.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Signed-off-by: Tibor Vass <tibor@docker.com>
 2018-04-26 16:25:52 +00:00
Kir Kolyshkin
7d62e40f7e Switch from x/net/context -> context 
Since Go 1.7, context is a standard package. Since Go 1.9, everything
that is provided by "x/net/context" is a couple of type aliases to
types in "context".

Many vendored packages still use x/net/context, so vendor entry remains
for now.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
 2018-04-23 13:52:44 -07:00
Vincent Demeester
aa0db6f9e1
Migrate TestAPISwarmServicesPlugin to integration 
Also starts to create more "poll/check" function to `internal/test/daemon`.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-04-18 16:18:53 +02:00
Vincent Demeester
239a8a5189
Small daemon refactoring and add swarm init/join helpers 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-04-16 10:20:10 +02:00
Vincent Demeester
f0d277fe84
Move integration-cli daemon package to internal/test… 
… and do not use the `docker` cli in it. One of the reason of this
move is to not make `integration` package using legacy
`integration-cli` package.

Next move will be to support swarm within this package *and* provide
some helper function using the api (compared to the one using cli in
`integration-cli/daemon` package).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-04-10 16:29:48 +02:00
Dennis Chen
b8912feeff Using the default PollSettings function 
Using the default PollSettings functions to adjust the timeout
value instead of changing the value each time when needed.

Signed-off-by: Dennis Chen <dennis.chen@arm.com>
 2018-03-29 05:00:14 +00:00
Daniel Nephin
c9e52bd0da Post migration assertion fixes 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-03-16 11:03:46 -04:00
Daniel Nephin
6be0f70983 Automated migration using 
gty-migrate-from-testify --ignore-build-tags

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-03-16 11:03:43 -04:00
Vincent Demeester
18dd1d9aba
Fixes some integration/container test to run on remote daemon 
```
docker build -f Dockerfile.e2e -t moby-e2e .
docker run -v /var/run/docker.sock:/var/run/docker.sock \
           -e TEST_INTEGRATION_DIR=/tests/integration/container \
           -e DOCKER_API_VERSION=1.36 moby-e2e
```

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-03-05 14:24:01 +01:00
Yong Tang
e9f19df6a9 Update api tests to use the newly added container helper package 
This fix is a follow up to 36266 to update some api tests
to use the newly added container helper package.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2018-02-10 23:30:40 +00:00
Vincent Demeester
af306d149e
Rename integration/util to integration/internal 
Both names have no real sense, but one allows to make sure these packages
aren't used outside of `integration`.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-02-10 09:16:32 +01:00
Vincent Demeester
6977f468bb
Migrate some calls to new client function 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-02-08 16:21:45 +01:00
Tianon Gravi
3a633a712c
Merge pull request #36194 from dnephin/add-canonical-import 
Add canonical import path
 2018-02-07 13:06:45 -08:00
Daniel Nephin
4f0d95fa6e Add canonical import comment 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-02-05 16:51:57 -05:00
Yong Tang
1d40e92899 Migrate usage of newSwarm in integration/service to use integration/utils/swarm.NewSwarm 
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2018-02-02 23:28:54 +00:00
Yong Tang
65ee7fff02 Add test cases for file mode with secret and config. 
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2018-01-28 16:48:10 +00:00
Yong Tang
50af496891 Add integration test for network connect with alias 
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2018-01-23 01:04:39 +00:00
Dennis Chen
4542016cbe Fix timeout issue of multi-services cration on AArch64 
Now we only adjust the timeout value for `arm` while not `arm64`,
actually the avarage duration for this test is about 25s to crate
multiple services on arm64, else the integration test will terminate
with below error:

> --- FAIL: TestCreateServiceMultipleTimes (24.11s)
>         daemon.go:285: [ddc3c7c1476c2] waiting for daemon to start
>         daemon.go:317: [ddc3c7c1476c2] daemon started
>         poll.go:121: timeout hit after 10s: task count at 4 waiting for 0
>         daemon.go:275: [ddc3c7c1476c2] exiting daemon
>         clean.go:108: Removing image sha256:e6a8d12d58602a19277ee5632b7ff9fa56a4ea52ba00eedf1d3f6f5a495fe761
>         clean.go:108: Removing image sha256:876244cc2ecb8fe1b0b2e817e3b78709a2a735edb093bc6849f99aa6c18f3a01

This PR adjusts the timeout value for both `arm64` and `arm` to mitigate
this issue on those 2 platforms.

Signed-off-by: Dennis Chen <dennis.chen@arm.com>
 2018-01-12 11:52:35 +00:00
Yong Tang
b249ccb115 Update and use FindNetwork on Windows. 
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2018-01-07 03:32:37 +00:00
Pradip Dhara
791d88b853 Adding test for creating service multiple times. 
Signed-off-by: Pradip Dhara <pradipd@microsoft.com>
 2017-11-30 13:03:44 -08:00
Simon Ferquel
f28cb422e6 Added support for swarm service isolation mode 
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
 2017-10-30 16:16:18 +01:00
Vincent Demeester
78cd8e8d18 Merge pull request #35248 from tophj-ibm/add-integration-testsetup 
[integration] add setupTest to integration test
 2017-10-23 18:39:13 +02:00
Christopher Jones
58151358c0
[integration] ensure frozen images are loaded 
Ensures that the frozen test images are loaded in the daemon
before any tests are run.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
 2017-10-20 16:51:13 -04:00
Kenfe-Mickael Laventure
ddae20c032
Update libcontainerd to use containerd 1.0 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-10-20 07:11:37 -07:00
Victor Vieux
a2ee40b98c Merge pull request #34674 from pradipd/windows_routingmesh 
Enabling ILB/ELB on windows using per-node, per-network LB endpoint.
 2017-09-18 15:56:17 -07:00
Pradip Dhara
9bed0883e7 Enabling ILB/ELB on windows using per-node, per-network LB endpoint. 
Signed-off-by: Pradip Dhara <pradipd@microsoft.com>
 2017-09-18 20:27:56 +00:00
Christopher Crone
7dabed019a Fixes after dnephin review 
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
 2017-09-14 19:27:09 +02:00
Christopher Crone
063c89c71f Protect entire environment when testing 
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
 2017-09-14 19:27:09 +02:00
Daniel Nephin
96707bc600 Fix integration suite and propagate failures 
Failures from the integration suite were not propagating to the outter shell
for some reason. Handle the failure with an if exit 1.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-09-01 13:07:47 -04:00
Daniel Nephin
f85ef42ea5 Refactor test environment 
split all non-cli portions into a new internal/test/environment package

Set a test environment on packages instead of creating new ones.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-08-30 13:13:18 -04:00
Daniel Nephin
6cd6d8646a Replace service ps cli tests with service inspect API test. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-08-25 17:27:41 -04:00