summaryrefslogtreecommitdiff
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Add network_mode support to Client.build1397-build-networkJoffrey F2017-06-191-0/+33
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1626 from datwiz/images-build-error-1625Joffrey F2017-06-191-0/+11
|\ | | | | fix #1625 where ImageCollection.build() could return with incorrect image id
| * new integration task linting for #1625Chris Ottinger2017-05-271-2/+2
| | | | | | | | Signed-off-by: Chris Ottinger <chris.ottinger@team.telstra.com>
| * added integration test for #1625 for ImageCollection.build() that verfies ↵Chris Ottinger2017-05-271-0/+11
| | | | | | | | | | | | that the build method uses the last success message for extracting the image id Signed-off-by: Chris Ottinger <chris.ottinger@team.telstra.com>
* | Add support for start_period in Healthcheck spechealthcheck-start-periodJoffrey F2017-06-161-4/+21
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1617 from docker/create-ingress-networkJoffrey F2017-06-161-0/+8
|\ \ | | | | | | Add support for ingress in create_network
| * | Add support for ingress in create_networkcreate-ingress-networkJoffrey F2017-05-171-0/+8
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Merge pull request #1631 from madhuri-rai07/masterJoffrey F2017-06-161-0/+9
|\ \ \ | | | | | | | | Add support for ``runtime`` config
| * | | Fix test cases for ``runtime`` configMadhuri Kumari2017-06-071-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Madhuri Kumari <madhuri.kumari@intel.com>
| * | | Add support for ``runtime`` in container create and run APIMadhuri Kumari2017-06-011-0/+9
| | |/ | |/|
* | | Merge pull request #1632 from kaiyou/masterJoffrey F2017-06-161-0/+6
|\ \ \ | | | | | | | | allow ipv6 :: notation in split_port (using re)
| * | | Add a specific unit test for splitting port with IPv6kaiyou2017-06-051-0/+6
| |/ / | | | | | | | | | | | | | | | The test was copied from https://github.com/greybyte/docker-py/commit/ccec87ca2c2aacfcfe3b38c5bc7d59dd73551c51 Signed-off-by: kaiyou <pierre@jaury.eu>
* | | Merge pull request #1648 from ChrsMark/masterJoffrey F2017-06-161-0/+7
|\ \ \ | | | | | | | | Raising error in case of invalid value of since kwarg on Container.logs
| * | | Raising error in case of invalid value of since kwarg on Container.logsChris Mark2017-06-161-0/+7
| | | | | | | | | | | | | | | | Signed-off-by: Chris Mark <chrismarkou92@gmail.com>
* | | | Closes #1588, image.tag does not return anythingOlivier Sallou2017-06-161-1/+2
|/ / / | | | | | | | | | | | | | | | This patch returns the check made against api when tagging an image as stated in documentation Signed-off-by: Olivier Sallou <olivier.sallou@irisa.fr>
* | | Merge pull request #1634 from grahamlyons/readtimeout_calling_container_stopJoffrey F2017-06-141-0/+13
|\ \ \ | | | | | | | | Ensure default timeout is used by API Client
| * | | Ensure default timeout is used by API Clientgrahamlyons2017-06-081-0/+13
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `from_env` method on the `docker` module passed `None` as the value for the `timeout` keyword argument which overrode the default value in the initialiser, taken from `constants` module. This sets the default in the initialiser to `None` and adds logic to set that, in the same way that `version` is handled. Signed-off-by: grahamlyons <graham@grahamlyons.com>
* | | Only pull the 'latest' tag when testing imagesBryan Boreham2017-06-141-3/+4
|/ / | | | | | | Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
* | update swarm remove test status code from 500 to >= 400allencloud2017-05-181-1/+1
| | | | | | | | Signed-off-by: allencloud <allen.sun@daocloud.io>
* | Merge pull request #1615 from docker/service-placementJoffrey F2017-05-171-0/+43
|\ \ | |/ |/| Add support for placement preferences and platforms in TaskTemplate
| * Add support for placement preferences and platforms in TaskTemplateservice-placementJoffrey F2017-05-171-0/+43
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Add `target` argument to image buildingYong Wen Chua2017-05-161-0/+22
|/ | | | | | | | | | This is related to the multi-stage image building that was introduced in 17.05 (API 1.29). This allows a user to specify the stage of a multi-stage Dockerfile to build for, rather than the final stage. Signed-off-by: Yong Wen Chua <me@yongwen.xyz>
* Merge pull request #1605 from allencloud/update-test-status-code-from-500-to-400Joffrey F2017-05-151-1/+1
|\ | | | | update docker-py test status code from 500 to 400
| * update docker-py test status code from 500 to 400allencloud2017-05-131-1/+1
| | | | | | | | Signed-off-by: allencloud <allen.sun@daocloud.io>
* | Replace erroneous networks argument in containers.run with singular1433-run-networksJoffrey F2017-05-122-3/+21
|/ | | | | | | | network equivalent. Small docfixes Signed-off-by: Joffrey F <joffrey@docker.com>
* Adjust tests and add newest engine version to Jenkinsfiletest_17.05_engineJoffrey F2017-05-092-13/+33
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* init_path removed in Engine 17.05init_path_removedJoffrey F2017-05-091-0/+1
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Include tag in images.get after pulling if provided separately1585-pull-tagJoffrey F2017-05-093-6/+13
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Add ContainerSpec mounts testJoffrey F2017-05-081-2/+18
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge branch '1577-multi-success-message' of ↵Joffrey F2017-05-051-0/+9
|\ | | | | | | https://github.com/aaronthebaron/docker-py into aaronthebaron-1577-multi-success-message
| * Add integration testsAaron Cowdin2017-05-021-0/+9
| | | | | | | | Signed-off-by: Aaron Cowdin <aaron.cowdin@gmail.com>
* | Modernize exec_api.pyJoffrey F2017-05-021-2/+2
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge branch 'add-env-support-to-exec' of ↵Joffrey F2017-05-022-1/+16
|\ \ | | | | | | | | | | | | | | | https://github.com/TomasTomecek/docker-py into TomasTomecek-add-env-support-to-exec Signed-off-by: Joffrey F <joffrey@docker.com>
| * | exec: add support for `Env`Tomas Tomecek2017-04-292-1/+16
| | | | | | | | | | | | Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
* | | Fix typo s/CpuSetCpus/CpusetCpus/Dan Liew2017-05-012-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | According to Docker's API documentation [1]. The parameter name is `CpusetCpus` not `CpuSetCpus`. [1] https://docs.docker.com/engine/api/v1.25/#operation/ContainerCreate Signed-off-by: Dan Liew <daniel.liew@imperial.ac.uk>
* | | Add missing support for `CpusetMems` parameter to HostConfig.Dan Liew2017-05-011-0/+27
| |/ |/| | | | | Signed-off-by: Dan Liew <daniel.liew@imperial.ac.uk>
* | Merge pull request #1570 from AlexeyRokhin/masterJoffrey F2017-04-282-0/+65
|\ \ | |/ |/| Add cpu_count, cpu_percent, nano_cpus parameters to container HostConfig.
| * cpus renamed to nano_cpus. Type and scale of nano_cpus are changed. Comments ↵Alexey Rokhin2017-04-282-10/+12
| | | | | | | | | | | | for new parameters are changed. Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
| * Add cpu_count, cpu_percent, cpus parameters to container HostConfig.Alexey Rokhin2017-04-192-0/+63
| | | | | | | | Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
* | Merge pull request #1493 from funkyfuture/model_propertiesJoffrey F2017-04-273-1/+17
|\ \ | | | | | | Adds a few model properties
| * | Adds an 'image' property to the container modelFrank Sachsenheim2017-04-151-0/+5
| | | | | | | | | | | | Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
| * | Adds a 'labels' property to the image modelFrank Sachsenheim2017-04-152-0/+6
| | | | | | | | | | | | Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
| * | Adds a 'labels' property to the container modelFrank Sachsenheim2017-04-152-1/+6
| |/ | | | | | | | | | | | | | | The Docker API seems to respond with a 'null' value for the 'Labels' attribute from containers that were created with older Docker versions. An empty dictionary is returned in this case. Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
* | Fix if replicas is set to 0, Fixes #1572Rob Kooper2017-04-261-0/+6
|/ | | | Signed-off-by: Rob Kooper <kooper@illinois.edu>
* Add support for volume_driver in HostConfigJoffrey F2017-04-052-9/+27
| | | | | | Some cleanup in ContainerConfig + warning if volume_driver is provided (API>1.20) Signed-off-by: Joffrey F <joffrey@docker.com>
* Fix test issuesappveyorJoffrey F2017-03-291-43/+37
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Set infinite timeout for the `events` methodJoffrey F2017-03-272-5/+5
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1524 from alex-dr/fix-apierror-statusJoffrey F2017-03-221-0/+65
|\ | | | | Fix APIError status_code property for client/server errors
| * Fix APIError status_code property for client/server errorsalex-dr2017-03-221-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | requests.Response objects evaluate as falsy when the status_code attribute is in the 400-500 range. Therefore we are assured that prior to this change, APIError would show `is_server_error() == False` when generated with a 500-level response and `is_client_error() == False` when generated with a 400-level response. This is not desirable. Added some seemingly dry (not DRY) unit tests to ensure nothing silly slips back in here. Signed-off-by: alex-dr <alex@datarobot.com>
* | Use experimental engine for testing in Jenkins/MakefileJoffrey F2017-03-171-0/+3
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>