summaryrefslogtreecommitdiff
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Rename Client -> DockerClientdocker_clientJoffrey F2016-11-282-3/+3
| | | | | | | Replace references to old Client with APIClient Moved contents of services.md to appropriate locations Signed-off-by: Joffrey F <joffrey@docker.com>
* Add helpful error for APIClient methods on ClientBen Firshman2016-11-221-0/+14
| | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* Add new user-focused APIBen Firshman2016-11-2221-32/+1583
| | | | | | See #1086 Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* Add random_name test helperBen Firshman2016-11-222-7/+8
| | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* Split out base integration test for APIClientBen Firshman2016-11-2212-64/+67
| | | | | | So the cleanup stuff can be reused for model tests. Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* Move APIClient tests into single fileBen Firshman2016-11-222-79/+71
| | | | | | For some reason this was spread across two files. Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* Rename DockerClientTest to BaseAPIClientTestBen Firshman2016-11-228-18/+18
| | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* Rename Client to APIClientBen Firshman2016-11-2221-51/+55
| | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* Remove AutoVersionClientBen Firshman2016-11-221-11/+0
| | | | | | Just do Client(version='auto'). Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* Drop support for Python 2.6Ben Firshman2016-11-227-79/+35
| | | | | | | Because it's ancient. If you're still using it, you can use an old version of docker-py. Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* Make docker.ssladaptor a single fileBen Firshman2016-11-221-1/+1
| | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* Make docker.auth a single fileBen Firshman2016-11-222-7/+5
| | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* Merge pull request #1236 from docker/host_config_isolationJoffrey F2016-11-172-1/+23
|\ | | | | Add support for isolation param in host config
| * Add support for isolation param in host confighost_config_isolationJoffrey F2016-09-292-1/+23
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Convert dicts to Healthcheck objects, string commands to CMD-SHELL listsAanand Prasad2016-11-161-34/+29
| | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | Rework healthcheck integration testAanand Prasad2016-11-162-27/+57
| | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | Add support for passing healthcheck to create_containerJamie Greeff2016-11-161-0/+35
| | | | | | | | Signed-off-by: Jamie Greeff <jamie@greeff.me>
* | Merge pull request #1281 from ↵Joffrey F2016-11-141-1/+2
|\ \ | | | | | | | | | | | | TomasTomecek/1265-ssl-test-no-sslX-support-in-openssl ssl,test: OpenSSL may not support ssl2
| * | ssl,test: OpenSSL may not support ssl2Tomas Tomecek2016-11-141-1/+2
| | | | | | | | | | | | | | | | | | Fixes #1265 Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
* | | Fix linting errorAanand Prasad2016-11-141-0/+1
|/ / | | | | | | | | | | | | This seems to have been ignored by older versions of flake8, and fixed in version 3.1.0 or 3.1.1. Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | Add labels and shmsize arguments to the image buildRyan Belgrave2016-11-081-0/+38
| | | | | | | | Signed-off-by: Ryan Belgrave <Ryan.Belgrave@target.com>
* | Fix broken unit testBen Firshman2016-11-071-1/+1
| | | | | | | | | | | | Introduced by https://github.com/docker/docker-py/pull/1230 Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | Merge pull request #1230 from LabattFoodService/updateNodeJoffrey F2016-11-073-0/+65
|\ \ | | | | | | enable setting of node labels #1225
| * | enable setting of node labels #1225Nathan Shirlberg2016-09-273-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | Added update_node function to enable setting labels on nodes. This exposes the Update a Node function from the Docker API and should enable promoting/demoting manager nodes inside a swarm. Signed-off-by: Nathan Shirlberg <nshirlberg@labattfood.com>
* | | WIPJoffrey F2016-11-041-0/+62
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Changes for service tests to pass in docker masterAlessandro Boch2016-11-011-13/+4
| | | | | | | | | | | | | | | | | | | | | - update config structure has new members - service name update is no longer supported Signed-off-by: Alessandro Boch <aboch@docker.com>
* | | Fix dockerignore exclusion logic on Windowswin32-test-fixesJoffrey F2016-10-141-0/+6
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Update tests to avoid failures on Windows platformsJoffrey F2016-10-149-102/+141
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Merge pull request #1256 from docker/format_env_unicode_bugJoffrey F2016-10-131-2/+17
|\ \ \ | | | | | | | | Do not break when calling format_environment with unicode values
| * | | Do not break when calling format_environment with unicode valuesformat_env_unicode_bugJoffrey F2016-10-121-2/+17
| | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | Remove trailing slashes in result of utils.parse_hostbase_url_trailing_slashJoffrey F2016-10-121-0/+5
|/ / / | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Move requires_api_version to helpersBen Firshman2016-10-0311-37/+35
| | | | | | | | | | | | | | | | | | | | | Because it's a helper, not a base thing. In preparation for moving/deleting the unit test base classes. Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | | Move BaseTestCase to BaseIntegrationTestBen Firshman2016-10-0314-168/+147
| |/ |/| | | | | | | | | | | | | Because two things called `BaseTestCase` is quite confusing. I haven't bothered refactoring the other `BaseTestCase` because that disappears anyway when we drop Python 2.6 support. Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | Merge pull request #1224 from mferon/addRestartPolicyUpdateSupportJoffrey F2016-09-291-0/+30
|\ \ | | | | | | Add support for restart policy update
| * | Add support for restart policy updateMaxime Feron2016-09-281-0/+30
| |/ | | | | | | Signed-off-by: Maxime Feron <maxime.feron@corp.ovh.com>
* | Adjust test_create_network_with_ipam_configAlessandro Boch2016-09-291-5/+4
|/ | | | | | | - to account for API change: IPAM class will now also include a Data class, besides Config. Signed-off-by: Alessandro Boch <aboch@docker.com>
* Merge pull request #1210 from docker/identity-token-supportJoffrey F2016-09-161-1/+25
|\ | | | | Add support for identity tokens in config file
| * Add support for identity tokens in config file.identity-token-supportJoffrey F2016-09-151-1/+25
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1215 from bfirsh/autopep8Joffrey F2016-09-142-4/+4
|\ \ | | | | | | Fix a few pep8 issues
| * | Fix a few pep8 issuesBen Firshman2016-09-142-4/+4
| |/ | | | | | | | | | | autopep8 --in-place --recursive --experimental -aaa --ignore E309 . Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | Merge pull request #1213 from bfirsh/parse-json-errorsJoffrey F2016-09-142-2/+19
|\ \ | | | | | | Parse JSON API errors
| * | Parse JSON API errorsBen Firshman2016-09-142-2/+19
| |/ | | | | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | Ignore not in swarm error when force leavingBen Firshman2016-09-142-16/+5
|/ | | | | | | | | Real errors were getting swallowed in these tests, producing other confusing cascading errors. This makes it much easier to make sure a node is not in a Swarm, while also handling other errors correctly. Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* Fix unit test which doesn't do anythingBen Firshman2016-09-072-37/+10
| | | | | | | It also overrode the fake API inspect endpoint with a broken response. Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* Add test for import_image with changes param1064-import-changesJoffrey F2016-09-061-0/+42
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Fix licensesBen Firshman2016-09-052-28/+0
| | | | | | | * Complete main LICENSE * Remove unnecessary licenses from individual files Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* Add support for force disconnect1105-network-apiJoffrey F2016-08-312-2/+30
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Add support for labels and enable_ipv6 in create_networkJoffrey F2016-08-311-1/+26
| | | | | | Tests + docs Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1167 from docker/1075-from-env-versionJoffrey F2016-08-251-0/+8
|\ | | | | Support version parameter in `Client.from_env`
| * Support version parameter in `Client.from_env`1075-from-env-versionJoffrey F2016-08-251-0/+8
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
View Lorry Controller Status