summaryrefslogtreecommitdiff
path: root/tests/integration/api_service_test.py
Commit message (Collapse)AuthorAgeFilesLines
* Fix broken test due to BUSYBOX -> TEST_IMG renameSebastiaan van Stijn2019-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | The BUSYBOX variable was renamed to TEST_IMG in 54b48a9b7ab59b4dcf49acf49ddf52035ba3ea08, however 0ddf428b6ce7accdac3506b45047df2cb72941ec got merged after that change, but was out of date, and therefore caused the tests to fail: ``` =================================== FAILURES =================================== ________ ServiceTest.test_create_service_with_network_attachment_config ________ tests/integration/api_service_test.py:379: in test_create_service_with_network_attachment_config container_spec = docker.types.ContainerSpec(BUSYBOX, ['true']) E NameError: global name 'BUSYBOX' is not defined ``` Fix the test by using the correct variable name. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* Merge pull request #2333 from hannseman/network-attachment-configJoffrey F2019-08-271-0/+29
|\ | | | | Add NetworkAttachmentConfig for service create/update
| * Add NetworkAttachmentConfig typeHannes Ljungberg2019-05-031-0/+29
| | | | | | | | Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
* | Update alpine version to 3.10, and rename BUSYBOX variableSebastiaan van Stijn2019-08-101-34/+34
|/ | | | Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* Add support for setting init on servicesHannes Ljungberg2019-03-281-0/+14
| | | | Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
* Make PlacementPreference build correct contextHannes Ljungberg2019-01-181-0/+15
| | | | Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
* Add support for RollbackConfigrollback_configJoffrey F2018-08-091-0/+21
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Add version checks and testJoffrey F2018-08-091-0/+14
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* GenericResources was introduced in 1.32Joffrey F2018-02-201-1/+2
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Code cleanup and version guardsJoffrey F2018-02-201-4/+4
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Add support for generic resources to docker.types.ResourcesWilliam Myers2018-02-201-0/+51
| | | | | | | - Add support for dict and list generic_resources parameter - Add generic_resources integration test Signed-off-by: William Myers <mwilliammyers@gmail.com>
* Add support for publish mode for endpointspec ports1878-publishmodeJoffrey F2018-01-311-1/+20
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Shift test matrix forwardjenkins-updateJoffrey F2018-01-241-2/+4
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1807 from rycus86/update_service_from_prev_specJoffrey F2017-12-141-0/+452
|\ | | | | Update service from prev spec
| * Renaming new argumentViktor Adam2017-12-141-15/+15
| | | | | | | | Signed-off-by: Viktor Adam <rycus86@gmail.com>
| * Attempting to make service update tests less flakyViktor Adam2017-11-151-1/+3
| | | | | | | | Signed-off-by: Viktor Adam <rycus86@gmail.com>
| * Service model update changesViktor Adam2017-11-141-25/+162
| | | | | | | | Signed-off-by: Viktor Adam <rycus86@gmail.com>
| * Update service using previous specViktor Adam2017-11-141-0/+313
| | | | | | | | Signed-off-by: Viktor Adam <rycus86@gmail.com>
* | Merge pull request #1834 from mhank/1823-support-update-orderJoffrey F2017-12-141-0/+18
|\ \ | | | | | | Add support for order property when updating a service
| * | Add support for order property when updating a serviceMichael Hankin2017-12-121-0/+18
| |/ | | | | | | Signed-off-by: Michael Hankin <mjhankin1@gmail.com>
* | Change format of extra hostsMichael Hankin2017-12-031-2/+2
|/ | | | Signed-off-by: Michael Hankin <mjhankin1@gmail.com>
* Add support for insert_defaults in inspect_serviceJoffrey F2017-11-071-0/+11
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Improve docs for service list filtersAlessandro Baldo2017-11-071-2/+13
| | | | | | | | - add "label" and "mode" to the list of available filter keys in the high-level service API - add "label" and "mode" to the list of available filter keys in the low-level service API - add integration tests Signed-off-by: Alessandro Baldo <git@baldoalessandro.net>
* More ContainerSpec testsJoffrey F2017-11-071-14/+37
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Add support for configs managementJoffrey F2017-11-071-3/+175
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Handle untyped ContainerSpec dict in _check_api_featuresJoffrey F2017-08-171-0/+17
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Add support for ContainerSpec.TTYJoffrey F2017-06-211-0/+17
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Add support for placement preferences and platforms in TaskTemplateservice-placementJoffrey F2017-05-171-0/+43
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Adjust tests and add newest engine version to Jenkinsfiletest_17.05_engineJoffrey F2017-05-091-6/+16
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Set infinite timeout for the `events` methodJoffrey F2017-03-271-2/+2
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Use experimental engine for testing in Jenkins/MakefileJoffrey F2017-03-171-0/+3
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Add service_logs integration testJoffrey F2017-03-131-3/+19
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Add tests for secret API implementationJoffrey F2017-02-131-0/+70
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Add prune_networks methodJoffrey F2017-01-301-13/+13
| | | | | | Ensure all integration tests use the same version of the busybox image Signed-off-by: Joffrey F <joffrey@docker.com>
* Add support for force_update in TaskTemplateJoffrey F2017-01-271-3/+24
| | | | | | Add min version checks in create_service and update_service Signed-off-by: Joffrey F <joffrey@docker.com>
* Add support for max_failure_ratio and monitor in UpdateConfigJoffrey F2017-01-271-0/+17
| | | | 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-081-1/+1
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Update code and tests for Engine 1.13 compatibilitydnephin-add-attachableJoffrey F2016-12-071-9/+13
| | | | | | Makefile now runs tests against Docker 1.13 RC Signed-off-by: Joffrey F <joffrey@docker.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>
* Split out base integration test for APIClientBen Firshman2016-11-221-2/+2
| | | | | | 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-221-0/+233
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
View Lorry Controller Status