summaryrefslogtreecommitdiff
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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>
* Merge pull request #1459 from shin-/1300-storageoptsJoffrey F2017-02-152-0/+20
|\ | | | | Add support for storage_opt in host_config
| * Add support for storage_opt in host_configJoffrey F2017-02-152-0/+20
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1449 from shin-/secrets-apiJoffrey F2017-02-155-4/+150
|\ \ | | | | | | Implement secrets API
| * | Add tests for secret API implementationJoffrey F2017-02-135-4/+150
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Add support for recursive wildcard pattern in .dockerignoreJoffrey F2017-02-141-3/+13
|/ / | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1432 from shin-/pluginsJoffrey F2017-02-134-0/+155
|\ \ | |/ | | Plugins API
| * Add create_plugin implementationJoffrey F2017-02-094-0/+41
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * APIClient implementation of plugin methodsJoffrey F2017-02-031-0/+114
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Fix passing volumes to run with no host pathBen Firshman2017-02-071-1/+11
| | | | | | | | | | | | | | | | | | Technically we shouldn't be passing them as binds, but the daemon doesn't seem to mind. Fixes #1380 Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | Fix volume path passed by run to create_containerBen Firshman2017-02-072-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | Seems like this is pretty much ignored by Docker, so it wasn't causing any visible issues, except when a volume name was used instead of a path. Also, added integration tests. Ref #1380 Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | Merge pull request #1425 from shin-/prunesJoffrey F2017-02-036-23/+81
|\ \ | | | | | | Prunes
| * | Add prune_networks methodJoffrey F2017-01-304-24/+44
| | | | | | | | | | | | | | | | | | Ensure all integration tests use the same version of the busybox image Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Add prune_volumes methodJoffrey F2017-01-302-1/+9
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Add prune_images methodJoffrey F2017-01-301-0/+16
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Add prune_containers methodJoffrey F2017-01-301-0/+14
| |/ | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1429 from shin-/fix_remove_network_testJoffrey F2017-01-301-4/+2
|\ \ | |/ |/| Improve robustness of remove_network integration test
| * Improve robustness of remove_network integration testJoffrey F2017-01-301-4/+2
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1341 from pacoxu/patch-1Joffrey F2017-01-302-3/+16
|\ \ | | | | | | Scope is added in volume after docker 1.12
| * | Scope is added in volume after docker 1.12徐俊杰2016-12-082-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: pacoxu <paco.xu@daocloud.io> add ut test for volume scope and no specified name create Signed-off-by: Paco Xu <paco.xu@daocloud.io> try to fix ut failure of volume creation Signed-off-by: Paco Xu <paco.xu@daocloud.io> try to fix ut failure of volume creation Signed-off-by: Paco Xu <paco.xu@daocloud.io> Scope is added in volume after docker 1.12 Signed-off-by: pacoxu <paco.xu@daocloud.io> Scope is added in volume after docker 1.12 Signed-off-by: pacoxu <paco.xu@daocloud.io>