Commit Graph

49 Commits

Author SHA1 Message Date
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
Joffrey F abaf346b49 Make running integration tests with dind possible 2015-09-09 14:49:36 -07:00
Aanand Prasad 6c0f7187a8 Integration test improvements
- Fix the setup step (the process has changed now that we're using
  pytest)

- Skip tests that are unstable

- Make better use of build caching

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-31 12:06:41 -07:00
Joffrey F b5f1e64e8f Ensure Makefile still run tests properly / tests are run in container as expected 2015-08-25 16:58:01 -07:00
Aanand Prasad 6e27c2a3d0 Run tests with pytest
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-25 16:34:33 +01:00
Joffrey F 5f0f085fc7 Updated Makefile to help with release testing 2015-07-22 11:34:36 -07:00
Joffrey F 070cbece0a Fixes for #586 2015-05-06 17:53:53 -07:00
Ben Firshman 4d0416ac91 Add Makefile for running tests in Docker
It assumes you've got Docker running on /var/run/docker.sock, but
that should be the case on both Linux and in Boot2Docker.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-10-16 17:55:22 +01:00