summaryrefslogtreecommitdiff
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Add ip4&ip6 (#935) support, network/id/connectMatt Daue2016-03-021-0/+48
| | | | | | | | | | | | Signed-off-by: Matt Daue <mattdaue@gmail.com> - Implement check to validate API ver is >= 1.22 for new feature - Includes patch @elchris82: Changed network in data dict to IPAMConfig as needed from the API. See https://github.com/docker/docker/issues/20732 - Update unit test for container attach to net - Update integration tests - Add integration test for IP setting Signed-off-by: Matt Daue <mattdaue@gmail.com>
* Merge pull request #916 from docker/container_update_featureJoffrey F2016-02-243-0/+43
|\ | | | | Support for container limits update
| * Improve parse_bytes util methodcontainer_update_featureJoffrey F2016-02-231-1/+1
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Unit test for Client.update_container methodJoffrey F2016-02-232-0/+25
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * New `update_container` methodJoffrey F2016-02-231-0/+18
| | | | | | | | | | | | Allows user to update container limits in-flight. Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #942 from seguins/934-separate-stream-follow-logsJoffrey F2016-02-242-6/+51
|\ \ | | | | | | Separate params stream and follow for logs.
| * | Separate params stream and follow for logs.Stéphane Seguin2016-02-162-6/+51
| | | | | | | | | | | | | | | | | | Closes #934 Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
* | | Fix env vars with empty values.Daniel Nephin2016-02-241-2/+5
| | | | | | | | | | | | Signed-off-by: Daniel Nephin <dnephin@gmail.com>
* | | Format environment variables to match docker-cli.Daniel Nephin2016-02-231-0/+10
| |/ |/| | | | | Signed-off-by: Daniel Nephin <dnephin@gmail.com>
* | Fix TLS regressionsAanand Prasad2016-02-231-3/+1
|/ | | | | | | | | - Set `verify` to the CA cert path if one has been specified, rather than `True` - Don't set `assert_fingerprint` Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* Merge pull request #928 from docker/926-ignored_dockerfilesJoffrey F2016-02-091-5/+17
|\ | | | | Never exclude Dockerfile from the build context.
| * Never exclude Dockerfile from the build context.926-ignored_dockerfilesJoffrey F2016-02-091-5/+17
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Don't break when parsing unknown config keys927-config-parsingJoffrey F2016-02-091-0/+29
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge branch 'VolumeBind' of https://github.com/keloyang/docker-py into ↵Joffrey F2016-02-081-2/+0
|\ | | | | | | keloyang-VolumeBind
| * create tempfile in VolumeBindTest for non-auto-creating of dockeryangshukui2016-02-041-0/+1
| | | | | | | | Signed-off-by: yangshukui <yangshukui@huawei.com>
* | Merge pull request #920 from docker/ssl_version_simplerJoffrey F2016-02-051-0/+17
|\ \ | | | | | | Remove obsolete SSL version computation
| * | Remove obsolete SSL version computationssl_version_simplerJoffrey F2016-02-031-0/+17
| |/ | | | | | | | | | | | | | | Recent versions of urllib3 (including the one packaged by requests) will automatically reject SSLv2/3. Additional test to check urllib3's behavior (mostly for release/packaging) Signed-off-by: Joffrey F <joffrey@docker.com>
* | Re-write kwargs_from_env to handle TLS options betterMike Dougherty2016-02-041-4/+51
| | | | | | | | | | | | | | | | This more closely matches the way the docker client interprets the relevant environment variables. Among other things, it's now possible to set DOCKER_TLS_VERIFY=false. Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
* | Add support for shm_size.Spencer Rinehart2016-02-041-0/+8
|/ | | | | | | --shm-size was added to Docker in 1.10 via docker/docker#16168. See docker/compose#2823 for more details. Signed-off-by: Spencer Rinehart <anubis@overthemonkey.com>
* Support unspecified protocol in base_url when using TLS894-docker_host_envJoffrey F2016-01-281-0/+5
| | | | | | (assume HTTPS) Signed-off-by: Joffrey F <joffrey@docker.com>
* Raise exceptions for API errors on network connect/disconnectAanand Prasad2016-01-251-0/+6
| | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* Support links when creating containers or connecting to networksAanand Prasad2016-01-203-0/+66
| | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* Merge pull request #880 from docker/813-parse-float-bytesJoffrey F2016-01-181-5/+20
|\ | | | | Handle 64-bit integer values in parse_bytes
| * parse_bytes: Add ability to handle 64-bit integers in py2Joffrey F2016-01-181-5/+20
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Add HttpHeaders support in load_configPavel Kravchenko2016-01-181-0/+24
|/ | | | Signed-off-by: Pavel Kravchenko <kpavel@il.ibm.com>
* Improve host devices supportJoffrey F2016-01-181-1/+60
| | | | | | | | Add unit tests for utils.parse_devices Rewrite documentation Support dict and string format for device declaration Signed-off-by: Joffrey F <joffrey@docker.com>
* Normalise/fix networking API JSON keysAanand Prasad2016-01-183-17/+58
| | | | | | | - Use CamelCase - `auxaddresses` -> `AuxiliaryAddresses` Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* Implement support for network-scoped aliasesAanand Prasad2016-01-144-4/+97
| | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* Merge pull request #818 from rmb938/patch-1Aanand Prasad2016-01-052-1/+40
|\ | | | | allow custom ipam options when creating networks
| * allow custom ipam options when creating networksRyan Belgrave2016-01-042-1/+40
| | | | | | | | Signed-off-by: Ryan Belgrave <rmb1993@gmail.com>
* | Update docker network inspect testwenchma2015-12-301-9/+5
|/ | | | | | | | This is based on https://github.com/docker/docker/pull/18928 Related to docker/docker#18626 Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
* Don't expect non-zero exit code when stopping a containerstop_test_updateJoffrey F2015-12-231-6/+0
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #863 from thomasboyt/fast-exclude-pathsAanand Prasad2015-12-162-6/+11
|\ | | | | Don't descend into ignored directories when building context
| * Improve get_paths performance by not descending into ignored directoriesThomas Boyt2015-12-082-6/+11
| | | | | | | | Signed-off-by: Thomas Boyt <thomas@ledgerx.com>
* | Treat 'index.docker.io' repo names as 'docker.io'Aanand Prasad2015-12-101-4/+27
| | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | Refactor resolve_authconfig testsAanand Prasad2015-12-101-32/+51
| | | | | | | | | | | | | | The structure of the fake config dictionary was not reflective of what actual parsed config looks like. Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | Fix remove_volume return valueSumit Sahrawat2015-12-102-4/+2
| | | | | | | | Signed-off-by: Sumit Sahrawat <sumit.sahrawat.apm13@iitbhu.ac.in>
* | Allow providing options when creating networksSumit Sahrawat2015-12-101-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Following the spec: http://docs.docker.com/engine/reference/api/docker_remote_api_v1.21/#create-a-network I have added an Options argument to create_network. This opens up the possibility of creating isolated containers with no internet access programmatically. We require such facilities in https://github.com/jupyter/tmpnb/issues/187. Signed-off-by: Sumit Sahrawat <sumit.sahrawat.apm13@iitbhu.ac.in>
* | Merge pull request #868 from jstewmon/config-stop-signalJoffrey F2015-12-081-0/+19
|\ \ | |/ |/| added stop_signal to create container config
| * added stop_signal to create container configJonathan Stewmon2015-12-031-0/+19
| | | | | | | | Signed-off-by: Jonathan Stewmon <jstewmon@rmn.com>
* | incorporate feedbackDustin Falgout2015-12-042-16/+5
| | | | | | | | Signed-off-by: Dustin Falgout <dustin@falgout.us>
* | Use new methods to raise exceptions in create_host_config.Dustin Falgout2015-12-031-0/+17
| | | | | | | | | | | | | | Added tests for the new methods. Closes #840 Signed-off-by: Dustin Falgout <dustin@falgout.us>
* | allow interactive execTomas Tomecek2015-12-033-47/+79
| | | | | | | | Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
* | tests,integration: ensure container is removed if start failsTomas Tomecek2015-12-021-1/+1
|/ | | | Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
* fix typo filter param for `volumes`Nicolas Delaby2015-12-011-0/+12
| | | | | | https://docs.docker.com/engine/reference/api/docker_remote_api_v1.21/#list-volumes Signed-off-by: Nicolas Delaby <nicolas.delaby@lock8.me>
* Add tests for new cases covered by parse_repository_tag860-deprecate-resolve-repo-nameJoffrey F2015-11-241-14/+46
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Update auth.resolve_repository_nameJoffrey F2015-11-231-7/+28
| | | | | | | | | | | More relaxed version that matches the constraints imposed by the current version of the docker daemon. Few unit tests to verify the new cases. Client.pull was trying to set the tag value when it wasn't supposed to, fixed now. utils.parse_repository_tag is simpler and supports @sha... notation Signed-off-by: Joffrey F <joffrey@docker.com>
* Fix integration-dind-ssl make task852-independent-integrationJoffrey F2015-11-181-1/+1
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Move methods/classes used by all integration tests to helpers.pyJoffrey F2015-11-1810-178/+179
| | | | | | | Ensure setup_module is called at session level, making the test suite not order dependent. Test files can be invoked independently. Signed-off-by: Joffrey F <joffrey@docker.com>
* Wrong key name in stats testJoffrey F2015-11-181-1/+1
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
View Lorry Controller Status