summaryrefslogtreecommitdiff
path: root/tests/utils_test.py
Commit message (Collapse)AuthorAgeFilesLines
* Make running integration tests with dind possibleJoffrey F2015-09-091-2/+6
|
* Default to 127.0.0.1:2375 on WindowsAanand Prasad2015-09-011-4/+12
| | | | | | Following the logic of the Docker client. Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* Merge branch 'default-cert-path' of https://github.com/aanand/docker-py into ↵Joffrey F2015-08-261-4/+34
|\ | | | | | | | | | | | | aanand-default-cert-path Conflicts: tests/utils_test.py
| * Default to ~/.docker if DOCKER_CERT_PATH is emptyAanand Prasad2015-07-211-4/+36
| | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | Merge pull request #721 from aanand/pathspecJoffrey F2015-08-261-1/+142
|\ \ | | | | | | Better support for .dockerignore
| * | Better support for .dockerignoreAanand Prasad2015-08-261-1/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Support all basic pattern forms: file, directory, *, ?, ! - Fix handling of wildcard patterns and subdirectories - `*/a.py` should match `foo/a.py`, but not `foo/bar/a.py` - Fix handling of directory patterns with a trailing slash - make sure they're handled equivalently to those without one - Fix handling of custom Dockerfiles - make sure they go in the tarball Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | | Don't remove LogConfig.types shortcutJoffrey F2015-08-261-2/+6
| | |
* | | Remove validation of supported log driversMazz Mosley2015-08-261-14/+4
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By having this hardcoded list of log drivers, it is a bottleneck to us supporting more log drivers. The daemon already validates if a log driver is valid or not, so rather than duplicating that validation, let's pass the log_driver along. This allows support for new/more log drivers as they become supported in docker without having to wait for both docker-py and docker-compose to support them. Keeping the current list of log driver types for backwards compatibility. Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
* | Merge branch 'pytest' of https://github.com/aanand/docker-py into aanand-pytestJoffrey F2015-08-251-12/+5
|\ \
| * | Use pytest helpers to assert exceptions and deprecated warningsAanand Prasad2015-08-251-7/+4
| | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
| * | Run tests with pytestAanand Prasad2015-08-251-5/+1
| | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | | Explicitly test NetworkMode logic in create_host_configAanand Prasad2015-08-251-5/+7
|/ / | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | Adapt tests to new create_host_config usageJoffrey F2015-08-241-6/+19
| |
* | Fixed #726 issue where split_port was checking `len(None)`Mark Adams2015-08-191-0/+8
| | | | | | | | | | | | - Fixed #726 by adding a check for None in split_port - Also switched to using a _raise_invalid_port() function to replace multiple slightly differing ValueErrors for invalid port
* | Added full path parse_host unit testallow-path-in-hostJoffrey F2015-08-171-1/+4
| |
* | Merge pull request #698 from docker/jhowardmsft-14530-netmodeJoffrey F2015-08-101-1/+1
|\ \ | | | | | | `network_mode` now necessary in `host_config`
| * | Fixed empty_host_config testJoffrey F2015-07-291-1/+1
| |/
* | Squashed commit of the following:Viktor Petersson2015-07-301-1/+35
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 4f053a06c1e9e3f63fd5afde60322f676acbdf45 Merge: 9177380 07a99ea Author: Viktor Petersson <vpetersson@wireload.net> Date: Thu Jul 30 14:37:16 2015 +0100 Merge branch 'master' into fixes commit 9177380ae9abf4ca01cf7a2a8b7de6640ed5f5d5 Author: Viktor Petersson <vpetersson@wireload.net> Date: Thu Jul 30 14:00:51 2015 +0100 Tweaks exception message. commit 6a5832e2f6655835a6b87897d7ec82d6ef5faa50 Author: Viktor Petersson <vpetersson@wireload.net> Date: Thu Jul 30 13:17:32 2015 +0100 Simplifies logic as per feedback. commit f750eddc34e5356dcfb53c16a7f98a99e817fa53 Author: Viktor Petersson <vpetersson@wireload.net> Date: Thu Jul 30 11:09:14 2015 +0100 Move return from list to dict. Adds exception handling. commit 8e50f57cceb6370b7f7b41624f50d5a6835301a0 Author: Viktor Petersson <vpetersson@wireload.net> Date: Thu Jul 30 10:15:58 2015 +0100 Reverts change to .gitignore. commit 5ba2c1b29706ddb74bef9c24c2a6e64bb369db22 Author: Viktor Petersson <vpetersson@wireload.net> Date: Wed Jul 29 21:15:21 2015 +0100 Fixes feedback. Adds three unittests. commit e1c719e61993fdaec0f22ba0de706af80587dc16 Author: Viktor Petersson <vpetersson@wireload.net> Date: Wed Jul 29 17:00:16 2015 +0100 WIP Adds test for parse_env_file commit 4448ae72e55d889d9d194a2c0303d182cb157d4c Author: Viktor Petersson <vpetersson@wireload.net> Date: Wed Jul 29 16:42:49 2015 +0100 Excludes coverage files. commit 19a5d01615dd9b7ee939f54f256e5bae89a94ee1 Author: Viktor Petersson <vpetersson@wireload.net> Date: Wed Jul 29 16:42:42 2015 +0100 Switch fixes logic. commit a8094c63a9f4351ae71393ea5603aa11c5c5bc94 Author: Viktor Petersson <vpetersson@wireload.net> Date: Wed Jul 29 11:45:56 2015 +0100 Implements logic for envfile parsing from Docker-cli Ref: https://github.com/docker/docker/blob/master/opts/envfile.go#L19-L51 commit ea9bfd95dfafe4023c58ab37f990158f73eb2e0d Author: Viktor Petersson <vpetersson@wireload.net> Date: Wed Jul 29 11:41:23 2015 +0100 Replaces CSV module with manual splitting. commit a001d28ff48309d2b2338aaf27253fdfaa0f6c4b Author: Viktor Petersson <vpetersson@wireload.net> Date: Wed Jul 29 11:35:37 2015 +0100 Removes isinstance on filename. commit 419d5961f6103df9166be3a9baa549276c12223d Author: Viktor Petersson <vpetersson@wireload.net> Date: Tue Jul 28 22:39:33 2015 +0100 Reflects @aanand's feedback. commit e81e3c8ed797ff939843d2485bf15525e85e890d Author: Viktor Petersson <vpetersson@wireload.net> Date: Tue Jul 28 15:43:32 2015 +0100 Typo fix. commit 2898389cada2bfca64bdfa71359aebeb3b5b6d1b Author: Viktor Petersson <vpetersson@wireload.net> Date: Tue Jul 28 15:41:08 2015 +0100 Refs #565. Adds minimal implementation of env_file client-side support.
* Stop pinging registries from the clientAanand Prasad2015-07-201-1/+90
| | | | | | | | | | | | | | | | | The daemon already pings the registry, so doing it on our end is redundant and error-prone. The `insecure_registry` argument to `push()`, `pull()` and `login()` has been deprecated - in the latter case, it wasn't being used anyway. The `insecure` argument to `docker.auth.resolve_repository_name()` has also been deprecated. `docker.utils.ping_registry()` has been deprecated. `docker.auth.expand_registry_url()` has been removed. Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* make memory units compatible with native docker clismothiki2015-05-071-1/+7
| | | | Signed-off-by: sivaram mothiki <smothiki@engineyard.com>
* Added tests for log_config paramlogconfig-supportJoffrey F2015-04-241-1/+21
|
* Improved ulimit testsJoffrey F2015-04-221-1/+13
|
* assertRaises 2.6 compatJoffrey F2015-04-221-6/+3
|
* Add tests for ulimitsJoffrey F2015-04-221-4/+34
|
* line lengthYuval Kohavi2015-04-111-3/+8
| | | | Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
* python 2.6 compatibleYuval Kohavi2015-04-111-6/+3
| | | | Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
* Adding port utils to split port rangesYuval Kohavi2015-04-031-0/+95
| | | | Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
* Update resolve_authconfig to bring it in line with Docker clientAanand Prasad2015-02-271-1/+11
| | | | | | | Instead of expanding the registry name we're looking for to a full URL, strip entries in the authconfig down to just the hostname. Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* Additional tests and small improvement to auth.resolve_authconfigJoffrey F2015-02-011-0/+55
|
* Use create_host_config in start (unifying parameter processing)0.7.0-releaseJoffrey F2014-12-181-1/+6
|
* assertEquals -> assertEqualJoffrey F2014-12-171-5/+5
|
* Changed assertIn to assertTrue(... in ...) (2.6 support)Joffrey F2014-11-031-3/+3
|
* Merge branch 'filters' of github.com:irachex/docker-py into irachex-filtersJoffrey F2014-11-031-6/+19
|\ | | | | | | | | | | | | Conflicts: docker/utils/__init__.py docker/utils/utils.py tests/utils_test.py
| * Add support for filtering images and containersHuayi Zhang2014-10-051-1/+15
| | | | | | | | | | | | | | [`filters` is a json encoded value of the filters (a map[string][string]) to process on the images list. ][1] The tricky thing is that we must convert boolean value to string and any filter value to list to make a `map[string][string]` json format [1]: https://docs.docker.com/reference/api/docker_remote_api_v1.14/#list-images
* | utils: add kwargs_from_envJohan Euphrosine2014-10-291-1/+31
|/
* Implemented complete parse_host method to handle all accepted values of ↵Joffrey F2014-07-031-1/+34
| | | | Client's base_url. Unit tests
* Python, not GoJoffrey F2014-06-171-3/+3
|
* make flake happyLuka Stojanovic2014-03-241-6/+12
|
* parse_repository_tag function and accompanying testLuka Stojanovic2014-03-241-0/+18
View Lorry Controller Status