summaryrefslogtreecommitdiff
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Add support for placement preferences and platforms in TaskTemplateservice-placementJoffrey F2017-05-171-0/+43
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* 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>
* | Add service_logs integration testJoffrey F2017-03-132-3/+29
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Raise an error when passing an empty string to split_portJoffrey F2017-03-092-2/+3
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Move LinksTest to appropriate fileJoffrey F2017-03-092-43/+45
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* fix: Missing exception handling in split_port when no container portLei Gong2017-03-091-0/+4
| | | | | | | | | | "localhost:host_port:" case will raise TypeError exception directly Catch the "TypeError" and give proper error message * docker/utils/ports.py Signed-off-by: Lei Gong <xue177125184@gmail.com>
* Merge pull request #1481 from shin-/system_dfJoffrey F2017-03-061-6/+13
|\ | | | | Add df method
| * Add df methodJoffrey F2017-03-011-6/+13
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1480 from shin-/bump-default-api-versionJoffrey F2017-03-061-1/+1
|\ \ | | | | | | Bump default API version to 1.26
| * | Bump default API version to 1.26Joffrey F2017-03-011-1/+1
| |/ | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Add init_path parameter to container HostConfigTomasz Madycki2017-03-011-0/+12
| | | | | | | | Signed-off-by: Tomasz Madycki <tomasz.madycki@gmail.com>
* | Add init parameter to container HostConfigTomasz Madycki2017-03-011-0/+12
| | | | | | | | Signed-off-by: Tomasz Madycki <tomasz.madycki@gmail.com>
* | Merge pull request #1479 from shin-/plugin-upgradeJoffrey F2017-03-011-0/+10
|\ \ | | | | | | Add upgrade_plugin method
| * | Add upgrade_plugin methodJoffrey F2017-02-231-0/+10
| |/ | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Update assert in test_create_with_restart_policyBoaz Shuster2017-03-011-1/+1
|/ | | | | | | | | | | | In https://github.com/docker/docker/pull/30870 a new error message is displayed if the container is restarting. To make "test_create_with_restart_policy" pass against the above change, the test checks that the error message contains "You cannot remove " instead of "You cannot remove a running container" Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
* Merge pull request #1467 from crierr/masterJoffrey F2017-02-221-0/+5
|\ | | | | Allow port range like 8000-8010:80
| * Allow port range like 8000-8010:80crierr2017-02-201-0/+5
| | | | | | | | Signed-off-by: SeungJin Oh <crierr@naver.com>
* | Merge pull request #1473 from Anvil/event-http-headersJoffrey F2017-02-211-3/+6
|\ \ | | | | | | Allow events daemon command to read config.json
| * | Fixed events command related unit tests by passing a timeout valueDamien Nadé2017-02-211-3/+6
| |/ | | | | | | Signed-off-by: Damien Nadé <github@livna.org>
* | Add ability to set 'Hostname' on a Service.Nils Krabshuis2017-02-191-2/+3
|/ | | | Signed-off-by: Nils Krabshuis <nils.krabshuis@redwood.com>
* Merge pull request #1460 from shin-/fix-cache-fromJoffrey F2017-02-161-15/+29
|\ | | | | Rename cachefrom -> cache_from
| * Rename cachefrom -> cache_fromJoffrey F2017-02-151-15/+29
| | | | | | | | | | | | | | Fix cache_from integration test Fix image ID detection in ImageCollection.build Signed-off-by: Joffrey F <joffrey@docker.com>
* | Add xfail mark to storageopt testJoffrey F2017-02-151-4/+5
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
View Lorry Controller Status