Commit Graph

57 Commits

Author SHA1 Message Date
aiordache b72988bc87 Add SSH tests
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-10-05 16:05:58 +02:00
Yuval Goldberg 0dfae33ce8 Add file environment variable to integration-dind
Signed-off-by: Yuval Goldberg <yuvigoldi@hotmail.com>
2020-08-18 15:18:52 +02:00
Sebastiaan van Stijn b4beaaac8c
Update default API version to v1.39 (#2512)
* Update default API version to v1.39

When running the docker-py integration tests in the Moby repository, some
tests were skipped because the API version used was too low:

    SKIPPED [1] tests/integration/api_service_test.py:882: API version is too low (< 1.38)
    SKIPPED [1] tests/integration/api_swarm_test.py:59: API version is too low (< 1.39)
    SKIPPED [1] tests/integration/api_swarm_test.py:38: API version is too low (< 1.39)
    SKIPPED [1] tests/integration/api_swarm_test.py:45: API version is too low (< 1.39)
    SKIPPED [1] tests/integration/api_swarm_test.py:52: API version is too low (< 1.39)

While it's possible to override the API version to use for testing
using the `DOCKER_TEST_API_VERSION` environment variable, we may want
to set the default to a version that supports all features that were
added.

This patch updates the default API version to v1.39, which is the minimum
version required for those features, and corresponds with Docker 18.09.

Note that the API version of the current (19.03) Docker release is v1.40,
but using that version as default would exclude users that did not update
their Docker version yet (and would not be needed yet for the features provided).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

* Makefile: set DOCKER_TEST_API_VERSION to v1.39

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-08-07 16:45:20 +02:00
Sebastiaan van Stijn 2c68b382a8
Update test engine version to 19.03.12
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-06-30 17:57:36 +02:00
Ulysses Souza 030af62dca
Merge pull request #2514 from thaJeztah/remove_obsolete_versions
Jenkinsfile: remove obsolete engine versions
2020-02-21 16:17:07 +01:00
Sebastiaan van Stijn 8ced47dca9
Use official docker:dind image instead of custom image
This replaces the custom dockerswarm/dind image with the official
dind images, which should provide the same functionality.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-17 10:25:56 +01:00
Sebastiaan van Stijn 7bef5e8676
Update test engine version to 19.03.5
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-15 00:00:48 +01:00
Sebastiaan van Stijn 5a91c2e83e
test/Dockerfile: allow using a mirror for the apt repository
With this change applied, the default debian package repository can be
replaced with a mirror;

```
make APT_MIRROR=cdn-fastly.deb.debian.org build-py3

...

Step 5/19 : RUN apt-get update && apt-get -y install     gnupg2     pass     curl
 ---> Running in 01c1101a0bd0
Get:1 http://cdn-fastly.deb.debian.org/debian buster InRelease [118 kB]
Get:2 http://cdn-fastly.deb.debian.org/debian-security buster/updates InRelease [39.1 kB]
Get:3 http://cdn-fastly.deb.debian.org/debian buster-updates InRelease [46.8 kB]
Get:4 http://cdn-fastly.deb.debian.org/debian buster/main amd64 Packages [7897 kB]
Get:5 http://cdn-fastly.deb.debian.org/debian-security buster/updates/main amd64 Packages [22.8 kB]
```

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-07-16 12:51:01 +02:00
Joffrey F 75e0ad017c
Merge pull request #2328 from docker/modernize_test_deps
Update some test dependencies / default values with newer versions
2019-05-01 02:48:05 -07:00
Joffrey F eba8345c37 Update some test dependencies / default values with newer versions
Signed-off-by: Joffrey F <joffrey@docker.com>
2019-05-01 02:36:19 -07:00
Joffrey F a823acc2ca Make dockerpycreds part of the SDK under docker.credentials
Signed-off-by: Joffrey F <joffrey@docker.com>
2019-04-30 23:37:55 -07:00
Joffrey F 3f3ca7ed43 Use networks instead of legacy links for test setup
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-03-20 10:14:09 +01:00
Joffrey F e304f91b46 Update detach tests to work with AF_INET as well
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-30 17:16:23 -08:00
Joffrey F ccd79323da Shift test matrix forward
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-24 11:39:43 -08:00
Joffrey F 0acef5f6d2 Add Python 3.6 testing
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-22 18:08:01 -08:00
Joffrey F 65ba043d15 Update test engine versions in Jenkinsfile
Signed-off-by: Joffrey F <joffrey@docker.com>

Conflicts:
	Jenkinsfile
2017-11-07 15:18:26 -08:00
Joffrey F e055729104 Disable buffering based on presence of Connection Upgrade headers
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-07 15:18:26 -08:00
Joffrey F 303b303855 Use unambiguous advertise-addr when initializing a swarm
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-07 15:18:26 -08:00
Joffrey F 921aba107b Update test versions
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-17 13:38:40 -07:00
Joffrey F 6ed0c01018 Adjust tests and add newest engine version to Jenkinsfile
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-09 17:18:46 -07:00
Frank Sachsenheim 6529fa599c Makes docs builds faster and ensures proper ownership
Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
2017-04-15 15:46:52 +02:00
Joffrey F 09813334c1 Add 17.04 (CE) RC1 to list of engine versions to be tested
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-28 16:22:35 -07:00
Joffrey F aeb5479fd5 Use experimental engine for testing in Jenkins/Makefile
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-17 18:30:33 -07:00
Joffrey F 48ac772994 Add upgrade_plugin method
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-23 17:27:04 -08:00
Joffrey F a1d550a14c Allow configuring API version for integration test with env var
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-25 16:52:26 -08:00
Joffrey F 93877241f9 Fix ImageNotFound detection
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-25 12:02:53 -08:00
Joffrey F 738cfdcdf9 Update code and tests for Engine 1.13 compatibility
Makefile now runs tests against Docker 1.13 RC

Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-07 14:51:14 -08:00
Ben Firshman 94083f25ac
Start to rename docker-py to docker-sdk-python
Pretty much everything except renaming the GitHub repo and
documentation, which is not actually done yet. Nearer the release
we can do a search/replace for all that stuff.

Ref #1310

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-28 16:45:59 +00:00
Ben Firshman c7a3aa7e44
Add new Sphinx documentation
Initial work thanks to @aanand.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:05:43 +00:00
Ben Firshman 087a049b06
Add --rm to docker run in Makefile
So tests don't leave containers all over the place. The downside
is this makes it a bit harder to debug a test's filesystem -
you'll have to remove the "--rm" and run the test again.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-21 14:07:39 +00:00
Ben Firshman 71b0b7761a
Add make shell to open a Python shell
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-09-14 17:15:10 +01:00
Ben Firshman 1a57f8800e
Add file arg to integration tests
make integration-test file=models_services_test.py

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-09-14 17:14:58 +01:00
Ben Firshman 0648923596
Add .PHONY for each makefile instruction
Makes it much easier to keep this maintained properly. See also:

http://clarkgrubb.com/makefile-style-guide#phony-targets

Replaces #1164

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-09-08 15:42:44 +01:00
Joffrey F 75497e0752 Add test for import_image with changes param
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-06 15:38:44 -07:00
Ben Firshman 291470146f
Add make docs command for building docs
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-09-05 19:23:04 +02:00
Joffrey F 9d48b4f603 Test fixes and updated Makefile for 1.12 testing
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-08-03 16:48:41 -07:00
Joffrey F 237f5318f2 Removed obsolete env var in integration-dind target command
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-04-26 14:32:49 -07:00
Joffrey F 5ace6204b4 Update default API version to 1.22
Update engine version used for integration tests

IP address configuration tests needed tweaking

Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-16 17:52:39 -07:00
Tomas Tomecek 2c3af6ca8e make,integration-dind: try to remove dpy-dind
b/c if test fails, dpy-dind is left running and integration-dind target
will refuse to start and you need to manually force-remove the container

Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
2015-12-02 09:46:29 +01:00
Joffrey F 73b51400a1 Fix integration-dind-ssl make task
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-11-18 15:41:32 -08:00
Joffrey F fe858f5ecc Add build integration test checking stderr shows up in stream
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-11-11 17:14:03 -08:00
Joffrey F 4f1304c108 Bump default API version to 1.21
Update Makefile to run tests against dind 1.9.0
Update network tests to account for latest API changes

Signed-off-by: Joffrey F <joffrey@docker.com>
2015-11-04 19:32:22 +01:00
Joffrey F 93a296fb04 Reorganize test directories
More clearly separate unit and integration tests
Allow splitting into multiple files
Cleaner

Signed-off-by: Joffrey F <joffrey@docker.com>
2015-10-21 16:02:09 -07:00
Stephen Moore 7f3692ceed Fix attach method over SSL connections
Signed-off-by: Stephen Moore <stephen@delfick.com>
2015-10-14 17:29:31 -07:00
Aanand Prasad b2c4228bb8 Move pytest default options into pytest.ini
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-09-25 20:16:57 +02:00
Joffrey F 8c270dfdf0 Merge pull request #780 from docker/contributing
[WIP] Contributing guidelines
2015-09-22 14:06:20 -07:00
Aanand Prasad eec0465832 Make volume binds tests work on any host
Instead of creating the test directory directly on the host, create it
by starting a container with the directory bind-mounted, so that it
doesn't matter whether the daemon is local, in a VM or remote.

This removes the need to make /tmp a volume in the test container, and
to share it with the dind container.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-09-22 11:34:49 -07:00
Joffrey F c4153c9c87 Add flake8 make task
Fix 'make test' task to run a complete series of tests

Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-21 15:35:28 -07:00
Joffrey F 1fb2db4951 Make integration tests more CI-friendly.
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-09 17:06:34 -07:00
Joffrey F fa3082b6cd Update integration-dind task 2015-09-09 14:49:58 -07:00