summaryrefslogtreecommitdiff
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Use pytest assertspytest-assertsJoffrey F2018-01-3028-1608/+1270
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1874 from docker/1774-export-methodsJoffrey F2018-01-292-2/+39
|\ | | | | Update save / export methods to return data generators
| * Update save / export methods to return data generators1774-export-methodsJoffrey F2018-01-262-2/+39
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | ImageCollection.build now also returns build logs along with the built image ↵1702-build-logs-dockerclientJoffrey F2018-01-261-7/+10
|/ | | | | | | | reference BuildError.build_logs has a copy of the logs generator Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1873 from docker/hongbin-image-loadJoffrey F2018-01-261-0/+5
|\ | | | | Return Image objects in ImageCollection.load
| * Error handling in ImageCollection.loadhongbin-image-loadJoffrey F2018-01-261-0/+5
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Return tuple instead of dict in exec_runJoffrey F2018-01-262-7/+9
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge branch 'add_exit_code_to_exec_run' of ↵Joffrey F2018-01-262-2/+24
|\ \ | |/ |/| | | https://github.com/hnq90/docker-py into hnq90-add_exit_code_to_exec_run
| * Add exit code to exec_runHuyNQ2017-11-132-2/+24
| | | | | | | | Signed-off-by: HuyNQ <huy@huynq.net>
* | Bump default API version to 1.35Joffrey F2018-01-265-3/+52
| | | | | | | | | | | | | | | | | | Add ContainerSpec.isolation support Add until support in logs Add condition support in wait Add workdir support in exec_create Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1856 from docker/1855-platform-optionJoffrey F2018-01-243-2/+26
|\ \ | | | | | | Add support for experimental platform flag in build and pull
| * | Add support for experimental platform flag in build and pull1855-platform-optionJoffrey F2018-01-233-2/+26
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Merge pull request #1846 from feliperuhland/issue-1734-scale-methodJoffrey F2018-01-241-0/+46
|\ \ \ | | | | | | | | Added scale method to the Service model.
| * | | Fix test to make sure the initial mode is replicatedFelipe Ruhland2018-01-031-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Felipe Ruhland <felipe.ruhland@gmail.com>
| * | | Ensure that global containers are not scaledFelipe Ruhland2017-12-261-0/+24
| | | | | | | | | | | | | | | | Signed-off-by: Felipe Ruhland <felipe.ruhland@gmail.com>
| * | | Added scale method to the Service model.Felipe Ruhland2017-12-211-0/+22
| | | | | | | | | | | | | | | | Signed-off-by: Felipe Ruhland <felipe.ruhland@gmail.com>
* | | | Shift test matrix forwardjenkins-updateJoffrey F2018-01-241-2/+4
| | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | Fix regression on API < 1.25Viktor Adam2018-01-121-0/+24
| |/ / |/| | | | | | | | Signed-off-by: Viktor Adam <rycus86@gmail.com>
* | | Ignore dockerignore lines that contain only whitespace1852-dockerignoreJoffrey F2018-01-031-0/+22
|/ / | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Don't attempt to retrieve container's stderr if `auto_remove` was set1813-autoremove-errorJoffrey F2017-12-191-1/+13
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1727 from mbelang/join-swarn-default-listen-addressJoffrey F2017-12-182-0/+49
|\ \ | | | | | | Add join_swarm default listen address
| * | Add join_swarm default listen addressMaxime Belanger2017-08-292-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | Since the docker CLI adds a default listen address (0.0.0.0:2377) when joining a node to the swarm, the docker-py api will support the same behavior to easy configuration. Signed-off-by: Maxime Belanger <maxime.b.belanger@gmail.com>
* | | Merge pull request #1828 from pkit/fix_error_from_httpexJoffrey F2017-12-181-1/+15
|\ \ \ | | | | | | | | fixes create_api_error_from_http_exception()
| * | | fixes create_api_error_from_http_exception()Constantine Peresypkin2017-12-181-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `create_api_error_from_http_exception()` is never tested in the original code and will fail miserably when fed with empty `HTTPError` object see fixes in requests for this behaviour: https://github.com/requests/requests/pull/3179 Signed-off-by: Constantine Peresypkin <pconstantine@gmail.com>
* | | | Retrieve container logs before container exits / is removed1813-run-autoremoveJoffrey F2017-12-143-8/+24
| | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | Merge pull request #1807 from rycus86/update_service_from_prev_specJoffrey F2017-12-143-4/+579
|\ \ \ \ | | | | | | | | | | Update service from prev spec
| * | | | Renaming new argumentViktor Adam2017-12-141-15/+15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Viktor Adam <rycus86@gmail.com>
| * | | | Fix resetting ContainerSpec properties to NoneViktor Adam2017-11-151-4/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Viktor Adam <rycus86@gmail.com>
| * | | | Attempting to make service update tests less flakyViktor Adam2017-11-152-4/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Viktor Adam <rycus86@gmail.com>
| * | | | Service model update changesViktor Adam2017-11-143-29/+285
| | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge pull request #1835 from docker/1758-url-quote-pathJoffrey F2017-12-131-0/+7
|\ \ \ \ | | | | | | | | | | Fix URL-quoting for resource names containing spaces
| * | | | Fix URL-quoting for resource names containing spaces1758-url-quote-pathJoffrey F2017-12-131-0/+7
| |/ / / | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | Add integration test for CPU realtime optionsJoffrey F2017-12-131-0/+14
| | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | Merge branch 'master' of https://github.com/tz70s/docker-py into tz70s-masterJoffrey F2017-12-131-0/+22
|\ \ \ \ | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | | | Fix #1575 - Add cpu_rt_period and cpu_rt_runtime argsTzu-Chiao Yeh2017-08-131-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add cpu_rt_period and cpu_rt_runtime in hostconfig with version(1.25), types(int) checks. Also add version and type checks in dockertype unit test. Signed-off-by: Tzu-Chiao Yeh <su3g4284zo6y7@gmail.com>
* | | | | Merge pull request #1812 from rycus86/greedy_network_listJoffrey F2017-12-132-4/+10
|\ \ \ \ \ | | | | | | | | | | | | Fetch network details with network lists greedily
| * | | | | Only allow greedy queries on the modelViktor Adam2017-11-212-45/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Viktor Adam <rycus86@gmail.com>
| * | | | | Fixing integration testsViktor Adam2017-11-192-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Viktor Adam <rycus86@gmail.com>
| * | | | | Fetch network details with network lists greedilyViktor Adam2017-11-163-4/+51
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Viktor Adam <rycus86@gmail.com>
* | | | | | Change format in which hosts are being stored for Swarm servicesMichael Hankin2017-12-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Hankin <mhank@users.noreply.github.com>
* | | | | | Change format of extra hostsMichael Hankin2017-12-032-3/+3
| |_|/ / / |/| | | | | | | | | | | | | | Signed-off-by: Michael Hankin <mjhankin1@gmail.com>
* | | | | Merge pull request #1798 from docker/unlock_swarm_supportJoffrey F2017-11-201-0/+11
|\ \ \ \ \ | |/ / / / |/| | | | Unlock swarm support
| * | | | Add unlock methods to Swarm modelunlock_swarm_supportJoffrey F2017-11-071-5/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | | | Add unlock_swarm and get_unlock_key to APIClientJoffrey F2017-11-071-0/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | | | Add support for insert_defaults in inspect_serviceJoffrey F2017-11-061-0/+11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | | | Update SwarmSpec to include new parametersJoffrey F2017-11-031-0/+38
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | | | Add support for scope filter in inspect_networkJoffrey F2017-11-021-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing scope implementation in create_network Signed-off-by: Joffrey F <joffrey@docker.com>
View Lorry Controller Status