summaryrefslogtreecommitdiff
path: root/tests/integration
Commit message (Collapse)AuthorAgeFilesLines
* Allow configuring API version for integration test with env varconfig_test_api_versionJoffrey F2017-01-2512-62/+73
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Fix Swarm model init to correctly pass arguments through to init_swarm1359-swarm-initJoffrey F2017-01-253-3/+4
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Convert mode argument to valid structure in create_service1388-format-service-modeJoffrey F2017-01-191-0/+28
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Prevent Swarm address conflictsjenkinsfileJoffrey F2016-12-086-19/+29
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1338 from docker/remove_nodeJoffrey F2016-12-071-0/+17
|\ | | | | Implement swarm node removal
| * Implement swarm node removalremove_nodeJoffrey F2016-12-071-0/+17
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Update code and tests for Engine 1.13 compatibilitydnephin-add-attachableJoffrey F2016-12-075-18/+41
| | | | | | | | | | | | Makefile now runs tests against Docker 1.13 RC Signed-off-by: Joffrey F <joffrey@docker.com>
* | Fix typo in create_networkJoffrey F2016-12-061-0/+11
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1272 from TomasTomecek/1271-fix-detach-in-exec-startBen Firshman2016-12-051-0/+15
|\ \ | |/ |/| exec: fix running with detach=True
| * exec: fix running with detach=TrueTomas Tomecek2016-11-291-0/+15
| | | | | | | | | | | | Fixes #1271 Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
* | Merge branch 'patch-1' of https://github.com/manics/docker-py into ↵manics-patch-1Joffrey F2016-12-021-0/+16
|\ \ | | | | | | | | | | | | | | | manics-patch-1 Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Add test for creating service with envSimon Li2016-11-111-0/+16
| | | | | | | | | | | | Signed-off-by: Simon Li <orpheus+devel@gmail.com>
* | | Move config type creation from docker.utils functions to classes inconfig_typesJoffrey F2016-12-012-16/+15
| |/ |/| | | | | | | | | docker.types Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1297 from docker/stepanstipl-allow_custom_pid_modeJoffrey F2016-11-281-7/+0
|\ \ | | | | | | Allow custom pid mode
| * | Re-enable pid_mode checks for API < 1.24stepanstipl-allow_custom_pid_modeJoffrey F2016-11-281-4/+0
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Allow custom PID mode for the containerStepan Stipl2016-11-281-3/+0
| | | | | | | | | | | | | | | | | | | | | Docker added support for sharing PID namespaces with other containers since version 1.12 (see https://github.com/docker/docker/pull/22481). Signed-off-by: Stepan Stipl <stepan@stipl.net>
* | | Remove MAINTAINER from DockerfilesBen Firshman2016-11-241-4/+0
|/ / | | | | | | | | | | | | | | It was deprecated in https://github.com/docker/docker/pull/25466 (Sorry @shin- ;) Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | Add new user-focused APIBen Firshman2016-11-229-0/+557
| | | | | | | | | | | | See #1086 Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | Add random_name test helperBen Firshman2016-11-221-7/+3
| | | | | | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | Split out base integration test for APIClientBen Firshman2016-11-2212-64/+67
| | | | | | | | | | | | So the cleanup stuff can be reused for model tests. Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | Rename Client to APIClientBen Firshman2016-11-2212-9/+10
| | | | | | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | Remove AutoVersionClientBen Firshman2016-11-221-11/+0
| | | | | | | | | | | | Just do Client(version='auto'). Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | Merge pull request #1236 from docker/host_config_isolationJoffrey F2016-11-171-0/+11
|\ \ | | | | | | Add support for isolation param in host config
| * | Add support for isolation param in host confighost_config_isolationJoffrey F2016-09-291-0/+11
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Convert dicts to Healthcheck objects, string commands to CMD-SHELL listsAanand Prasad2016-11-161-34/+29
| | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | | Rework healthcheck integration testAanand Prasad2016-11-161-27/+48
| | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | | Add support for passing healthcheck to create_containerJamie Greeff2016-11-161-0/+35
| |/ |/| | | | | Signed-off-by: Jamie Greeff <jamie@greeff.me>
* | Add labels and shmsize arguments to the image buildRyan Belgrave2016-11-081-0/+38
| | | | | | | | Signed-off-by: Ryan Belgrave <Ryan.Belgrave@target.com>
* | Merge pull request #1230 from LabattFoodService/updateNodeJoffrey F2016-11-071-0/+24
|\ \ | | | | | | enable setting of node labels #1225
| * | enable setting of node labels #1225Nathan Shirlberg2016-09-271-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | Added update_node function to enable setting labels on nodes. This exposes the Update a Node function from the Docker API and should enable promoting/demoting manager nodes inside a swarm. Signed-off-by: Nathan Shirlberg <nshirlberg@labattfood.com>
* | | WIPJoffrey F2016-11-041-0/+62
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Changes for service tests to pass in docker masterAlessandro Boch2016-11-011-13/+4
| | | | | | | | | | | | | | | | | | | | | - update config structure has new members - service name update is no longer supported Signed-off-by: Alessandro Boch <aboch@docker.com>
* | | Fix dockerignore exclusion logic on Windowswin32-test-fixesJoffrey F2016-10-141-0/+6
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Update tests to avoid failures on Windows platformsJoffrey F2016-10-145-44/+43
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Move requires_api_version to helpersBen Firshman2016-10-036-7/+6
| | | | | | | | | | | | | | | | | | | | | Because it's a helper, not a base thing. In preparation for moving/deleting the unit test base classes. Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | | Move BaseTestCase to BaseIntegrationTestBen Firshman2016-10-0313-76/+147
| |/ |/| | | | | | | | | | | | | Because two things called `BaseTestCase` is quite confusing. I haven't bothered refactoring the other `BaseTestCase` because that disappears anyway when we drop Python 2.6 support. Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | Merge pull request #1224 from mferon/addRestartPolicyUpdateSupportJoffrey F2016-09-291-0/+30
|\ \ | | | | | | Add support for restart policy update
| * | Add support for restart policy updateMaxime Feron2016-09-281-0/+30
| |/ | | | | | | Signed-off-by: Maxime Feron <maxime.feron@corp.ovh.com>
* | Adjust test_create_network_with_ipam_configAlessandro Boch2016-09-291-5/+4
|/ | | | | | | - to account for API change: IPAM class will now also include a Data class, besides Config. Signed-off-by: Alessandro Boch <aboch@docker.com>
* Merge pull request #1213 from bfirsh/parse-json-errorsJoffrey F2016-09-142-2/+19
|\ | | | | Parse JSON API errors
| * Parse JSON API errorsBen Firshman2016-09-142-2/+19
| | | | | | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | Ignore not in swarm error when force leavingBen Firshman2016-09-142-16/+5
|/ | | | | | | | | Real errors were getting swallowed in these tests, producing other confusing cascading errors. This makes it much easier to make sure a node is not in a Swarm, while also handling other errors correctly. Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* Add test for import_image with changes param1064-import-changesJoffrey F2016-09-061-0/+42
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Add support for force disconnect1105-network-apiJoffrey F2016-08-311-1/+29
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Add support for labels and enable_ipv6 in create_networkJoffrey F2016-08-311-1/+26
| | | | | | Tests + docs Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge branch 'jp-cpushares' of https://github.com/joshpurvis/docker-py into ↵Joffrey F2016-08-231-2/+29
|\ | | | | | | joshpurvis-jp-cpushares
| * Move cpu_shares and cpuset_cpu to HostConfig when API >= 1.18Josh Purvis2016-08-151-2/+29
| | | | | | | | Signed-off-by: Josh Purvis <joshua.purvis@gmail.com>
* | Private images support in create_service / update_service1085-service-supportJoffrey F2016-08-231-1/+0
| | | | | | | | | | | | | | | | Refactor auth header computation Add tasks methods and documentation. Signed-off-by: Joffrey F <joffrey@docker.com>
* | Add services documentationJoffrey F2016-08-221-1/+1
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | New docker.types subpackage containing advanced config dictionary typesJoffrey F2016-08-191-3/+93
| | | | | | | | | | | | | | Tests and docs updated to match docker.utils.types has been moved to docker.types Signed-off-by: Joffrey F <joffrey@docker.com>
View Lorry Controller Status