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

55 commits

Author SHA1 Message Date
Sam Whited
b37c214e3c testutil: make testing packages public 
This was done with something along the lines of:

```
mv internal/test testutil
pushd testutil/; grep -IRl "package test" | xargs -I '{}' sed -i -e 's|package test|package testutil|g' {}; popd
mv internal/testutil/*.go testutil/ && rm -rf internal/
grep -IRl "github.com\/docker\/docker\/internal\/test" | xargs -I '{}' sed -i -e 's|github.com/docker/docker/internal/test|github.com/docker/docker/test|g' {}
goimports .
```

I also modified the basic plugin path in testutil/fixtures/plugin.

Signed-off-by: Sam Whited <sam@samwhited.com>
 2019-09-11 07:47:23 -05:00
Tibor Vass
59e55dcdd0 rm-gocheck: run goimports to compile successfully 
goimports -w \
-- "./integration-cli/daemon" "./pkg/discovery" "./pkg/discovery/file" "./pkg/discovery/kv" "./pkg/discovery/memory" "./pkg/discovery/nodes" "./integration-cli" \
&& \
 gofmt -w -s \
-- "./integration-cli/daemon" "./pkg/discovery" "./pkg/discovery/file" "./pkg/discovery/kv" "./pkg/discovery/memory" "./pkg/discovery/nodes" "./integration-cli"

Signed-off-by: Tibor Vass <tibor@docker.com>
 2019-09-09 21:06:12 +00:00
Tibor Vass
1d92789b4f rm-gocheck: check.C -> testing.T 
sed -E -i 's#\bcheck\.C\b#testing.T#g' \
-- "integration-cli/check_test.go" "integration-cli/daemon/daemon.go" "integration-cli/daemon/daemon_swarm.go" "integration-cli/daemon_swarm_hack_test.go" "integration-cli/docker_api_attach_test.go" "integration-cli/docker_api_build_test.go" "integration-cli/docker_api_build_windows_test.go" "integration-cli/docker_api_containers_test.go" "integration-cli/docker_api_containers_windows_test.go" "integration-cli/docker_api_exec_resize_test.go" "integration-cli/docker_api_exec_test.go" "integration-cli/docker_api_images_test.go" "integration-cli/docker_api_inspect_test.go" "integration-cli/docker_api_logs_test.go" "integration-cli/docker_api_network_test.go" "integration-cli/docker_api_stats_test.go" "integration-cli/docker_api_swarm_node_test.go" "integration-cli/docker_api_swarm_service_test.go" "integration-cli/docker_api_swarm_test.go" "integration-cli/docker_api_test.go" "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_cp_from_container_test.go" "integration-cli/docker_cli_cp_test.go" "integration-cli/docker_cli_cp_to_container_test.go" "integration-cli/docker_cli_cp_to_container_unix_test.go" "integration-cli/docker_cli_cp_utils_test.go" "integration-cli/docker_cli_create_test.go" "integration-cli/docker_cli_daemon_plugins_test.go" "integration-cli/docker_cli_daemon_test.go" "integration-cli/docker_cli_events_test.go" "integration-cli/docker_cli_events_unix_test.go" "integration-cli/docker_cli_exec_test.go" "integration-cli/docker_cli_exec_unix_test.go" "integration-cli/docker_cli_external_volume_driver_unix_test.go" "integration-cli/docker_cli_health_test.go" "integration-cli/docker_cli_history_test.go" "integration-cli/docker_cli_images_test.go" "integration-cli/docker_cli_import_test.go" "integration-cli/docker_cli_info_test.go" "integration-cli/docker_cli_info_unix_test.go" "integration-cli/docker_cli_inspect_test.go" "integration-cli/docker_cli_links_test.go" "integration-cli/docker_cli_login_test.go" "integration-cli/docker_cli_logout_test.go" "integration-cli/docker_cli_logs_test.go" "integration-cli/docker_cli_netmode_test.go" "integration-cli/docker_cli_network_unix_test.go" "integration-cli/docker_cli_plugins_logdriver_test.go" "integration-cli/docker_cli_plugins_test.go" "integration-cli/docker_cli_port_test.go" "integration-cli/docker_cli_proxy_test.go" "integration-cli/docker_cli_prune_unix_test.go" "integration-cli/docker_cli_ps_test.go" "integration-cli/docker_cli_pull_local_test.go" "integration-cli/docker_cli_pull_test.go" "integration-cli/docker_cli_push_test.go" "integration-cli/docker_cli_registry_user_agent_test.go" "integration-cli/docker_cli_restart_test.go" "integration-cli/docker_cli_rmi_test.go" "integration-cli/docker_cli_run_test.go" "integration-cli/docker_cli_run_unix_test.go" "integration-cli/docker_cli_save_load_test.go" "integration-cli/docker_cli_save_load_unix_test.go" "integration-cli/docker_cli_search_test.go" "integration-cli/docker_cli_service_create_test.go" "integration-cli/docker_cli_service_health_test.go" "integration-cli/docker_cli_service_logs_test.go" "integration-cli/docker_cli_service_scale_test.go" "integration-cli/docker_cli_sni_test.go" "integration-cli/docker_cli_start_test.go" "integration-cli/docker_cli_stats_test.go" "integration-cli/docker_cli_swarm_test.go" "integration-cli/docker_cli_swarm_unix_test.go" "integration-cli/docker_cli_top_test.go" "integration-cli/docker_cli_update_unix_test.go" "integration-cli/docker_cli_userns_test.go" "integration-cli/docker_cli_v2_only_test.go" "integration-cli/docker_cli_volume_test.go" "integration-cli/docker_deprecated_api_v124_test.go" "integration-cli/docker_deprecated_api_v124_unix_test.go" "integration-cli/docker_hub_pull_suite_test.go" "integration-cli/docker_utils_test.go" "integration-cli/events_utils_test.go" "integration-cli/fixtures_linux_daemon_test.go" "integration-cli/utils_test.go" "pkg/discovery/discovery_test.go" "pkg/discovery/file/file_test.go" "pkg/discovery/generator_test.go" "pkg/discovery/kv/kv_test.go" "pkg/discovery/memory/memory_test.go" "pkg/discovery/nodes/nodes_test.go"

Signed-off-by: Tibor Vass <tibor@docker.com>
 2019-09-09 21:05:55 +00:00
Sebastiaan van Stijn
6345208b9b
Replace some checkers and assertions with gotest.tools 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-04-05 16:45:37 +02:00
Kir Kolyshkin
7e7ff2a033 integration-cli/build: don't panic 
A lack of check in the test code can lead to a panic due to
`len(ids)` being `0`.

Avoid the panic by adding appropriate checks. Note `Assert()` should be
used rather than `Check()` as if it fails we should not proceed with the
test.

Originally found in https://github.com/moby/moby/pull/38404.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
 2018-12-20 18:51:57 -08: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
f23c00d870
Various code-cleanup 
remove unnescessary import aliases, brackets, and so on.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-05-23 17:50:54 +02:00
Anda Xu
e440831802 fix and skip some tests based on API version 
Signed-off-by: Anda Xu <anda.xu@docker.com>

Co-authored-by: Anda Xu <anda.xu@docker.com>
Co-authored-by: Tibor Vass <tibor@docker.com>
 2018-05-15 16:05:04 -07: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
42f6fdf059
Move integration-cli/request to internal/test/request… 
… and change a bit the method signature

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-04-17 16:25:59 +02:00
Vincent Demeester
062564084a
Move fakecontext, fakegit and fakestorage to internal/test 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-04-17 09:53:09 +02:00
Vincent Demeester
183076e89d
Migrate test-integration-cli experimental build tests to integration 
All `docker build` tests that require an `ExperimentalDaemon` are
migrated to `integration/build` package and start an experimental
daemon to test on it.

The end goal being to remove the `experimental` builds.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-03-30 13:10:02 +02: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
Daniel Nephin
0a91ba2d8c Remove duplicate calls for getting an APIClient 
Remove request.SockRequest
Remove request.SockRequestHijack
Remove request.SockRequestRaw()
Remove deprecated ParseHost
Deprecate and unexport more helpers

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-02-20 17:27:24 -05:00
Yong Tang
8c31aacebf
Merge pull request #36018 from thaJeztah/remove-deprecated-testenv-functions 
Remove deprecated integration-cli/environment functions
 2018-01-15 13:24:52 -08:00
Sebastiaan van Stijn
18a771a761
Remove deprecated environment.DaemonPlatform() 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-01-15 15:32:06 +01:00
Sebastiaan van Stijn
63a0e88e8a
ineffassign: fix unused variables 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-01-13 13:35:10 +01:00
John Stephens
a97817b673
Set OS on scratch image and prevent panic if empty 
Signed-off-by: John Stephens <johnstep@docker.com>
 2017-11-06 18:22:15 -08:00
Tonis Tiigi
d472974902 builder: updates to session after vendor 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-09-22 09:51:52 -07:00
Akihiro Suda
22e15721b1 Merge pull request #33492 from simonferquel/typed-builder-commands-squashed 
[Builder] Introduce a typed command system and 2 phase parse/dispatch build
 2017-09-20 02:52:23 +09:00
Simon Ferquel
669c067798 Introduce a typed command system and 2 phase parse/dispatch build 
This is a work base to introduce more features like build time
dockerfile optimisations, dependency analysis and parallel build, as
well as a first step to go from a dispatch-inline process to a
frontend+backend process.

Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
 2017-09-18 09:48:56 +02:00
Christopher Crone
86f9eb4a08 Fixes for dnephin review 
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
 2017-09-14 19:27:09 +02:00
Christopher Crone
f089a1df39 Skip some tests for E2E 
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
 2017-09-14 19:27:09 +02:00
Tonis Tiigi
ba6f9e4cc9 integration-cli: fix testutil refactor merge conflict 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-08-28 10:19:54 -07:00
Tõnis Tiigi
a1183dda57 Merge pull request #34263 from estesp/chown-flag-add-copy 
Add --chown flag to ADD/COPY commands
 2017-08-28 09:50:44 -07:00
Daniel Nephin
4f304e72a2 Remove testutil.ReadBody 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-08-22 17:15:26 -04:00
Phil Estes
19a29f6fcf
Rebase --chown function for ADD/COPY 
Rebases and completes initial PR for (prior: --user) --chown flag for
ADD/COPY commands in Dockerfile.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2017-08-22 13:39:25 -04:00
Tibor Vass
41445a4745 Remove client/session package, depend on buildkit's session package 
gofmt -w -r '"github.com/docker/docker/client/session" -> "github.com/moby/buildkit/session"'
gofmt -w -r '"github.com/docker/docker/client/session/filesync" -> "github.com/moby/buildkit/session/filesync"'

Signed-off-by: Tibor Vass <tibor@docker.com>
 2017-07-28 16:34:23 -07:00
Tonis Tiigi
2981667e11 build: fix add from remote url 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-06-27 10:38:01 -07:00
Tonis Tiigi
5c3d2d552b Implement incremental file sync using client session 
Also exposes shared cache and garbage collection/prune
for the source data.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-06-22 11:52:35 -07:00
Tonis Tiigi
c268d9da4b builder: fix copy —from conflict with force pull 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-06-20 15:45:33 -07:00
Daniel Nephin
f1ade82d82 Fix Cache with ONBUILD 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-06-06 10:52:29 -04:00
Daniel Nephin
3f26041577 Fix ONBUILD COPY 
the source was missing from the second dispatch

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-06-02 17:47:03 -04:00
Tonis Tiigi
d1faf3df27 Refactor remote context parsing 
Redefine a better interface for remote context dependency.

Separate Dockerfile build instruction from remote context.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-04-25 14:35:31 -07:00
Vincent Demeester
a582d9dc42
[integration] Move fakegit to its own package in cli 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-04-19 15:52:03 +02:00
Vincent Demeester
56fb4653e8
Move FakeContext to integration-cli/cli/build/context package… 
… and continue emptying `docker_utils_test.go` from build related function.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-04-11 18:25:49 +02:00
Vincent Demeester
b11ba1231e
Update request.* signature to remove the host 
99.9% of use case for request call are using daemonHost. This makes it
default and adds a `request.DoOnHost` function to be able to specify
the host for specific, more complex use cases.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-03-06 16:41:33 +01:00
Vincent Demeester
f85ee17810
Convert request.SockRequestRaw to appropriate methods 
`request.SockRequestRaw` is deprecated, let's use appropriate methods
for those. This is a first pass, `SockRequest` still needs to be removed.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-02-28 17:12:30 +01:00
Vincent Demeester
c10f6ef43f
Clean more build utils in integration cli 
- Remove deprecated buildImage* functions
- Rename buildImageNew to buildImage
- Use *check.C in fakeContext* setup and in getIdByName

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-01-17 15:42:38 +01:00
Vincent Demeester
c8016e669f
Use testEnv methods and remove most of the global variables 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-01-17 12:39:08 +01:00
Vincent Demeester
d69d4799a3
Add a new request package in integration-cli 
The goal is to remove function from `docker_utils.go` and setup
simple, one-responsability package that can be well tested ; and to
ease writing request.

This moves all the calls to `sockRequest` (and similar methods) to
their counterpart in the `request` package.

This introduce `request.Do` to write easier request (with functional
argument to easily augment the request) with some pre-defined function
for the most used http method (i.e. `request.Get`, `request.Post` and
`request.Delete`).

Few of the `sockRequest` call have been moved to `request.Do` (and
`Get`, etc.) to showcase the usage of the package. There is still a
whole lot to do.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-01-03 11:49:30 +01:00
Vincent Demeester
33968e6c7d
Remove pkg/integration and move it to testutil or integration-cli 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-12-30 18:26:34 +01:00
Vincent Demeester
48de91a33f Extract daemon to its own package 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-12-09 22:26:42 +01:00
Akihiro Suda
7fb7a477d7 [nit] integration-cli: obey Go's naming convention 
No substantial code change.

 - Api         --> API
 - Cli         --> CLI
 - Http, Https --> HTTP, HTTPS
 - Id          --> ID
 - Uid,Gid,Pid --> UID,PID,PID
 - Ipam        --> IPAM
 - Tls         --> TLS (TestDaemonNoTlsCliTlsVerifyWithEnv --> TestDaemonTLSVerifyIssue13964)

Didn't touch in this commit:
 - Git: because it is officially "Git": https://git-scm.com/
 - Tar: because it is officially "Tar": https://www.gnu.org/software/tar/
 - Cpu, Nat, Mac, Ipc, Shm: for keeping a consistency with existing production code (not changable, for compatibility)

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-09-30 01:21:05 +00:00
Akihiro Suda
f453261b4a Fix TestBuildApiDockerFileRemote 
TestBuildApiDockerFileRemote has been consistently failing (EPERM) on the host
with #26618, which prohibits /sys/firmware from being accessed using apparmor.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-09-20 14:15:37 +00:00
John Howard
8bc1c9c08a Windows: Enable 5 Build API tests 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-08-30 08:41:17 -07:00
Vincent Demeester
e08aed59df Merge pull request #23322 from tkopczynski/20784-builder-dockerfile-symlink 
Reimplement integration test for symlink Dockerfile as a unit test
 2016-06-15 10:52:49 +02:00
Tomasz Kopczynski
830584b011 Reimplement integration test for symlink Dockerfile as a unit test 
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
 2016-06-14 23:07:19 +02:00
Tomasz Kopczynski
fb175bb367 Reimplementing builder tests for Dockerfile outside context as a unit test 
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
 2016-06-05 08:39:06 +02:00
Aaron Lehmann
8691a77e44 Fix build cache false positives when build context tar contains unnormalized paths 
If a build context tar has path names of the form 'x/./y', they will be
stored in this unnormalized form internally by tarsum. When the builder
walks the untarred directory tree and queries hashes for each relative
path, it will query paths of the form 'x/y', and they will not be found.

To correct this, have tarsum normalize path names by calling Clean.

Add a test to detect this caching false positive.

Fixes #21715

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-04-14 17:57:45 -07:00