summaryrefslogtreecommitdiff
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Test UID validity715-user-int-uidJoffrey F2015-08-311-1/+4
|
* Always send a string for the user param in create_containerJoffrey F2015-08-311-0/+3
|
* Test has been fixed, remove skip decoratorJoffrey F2015-08-311-1/+0
|
* Merge pull request #747 from aanand/integration-test-fixesJoffrey F2015-08-311-45/+79
|\ | | | | Integration test improvements
| * Integration test improvementsAanand Prasad2015-08-311-45/+79
| | | | | | | | | | | | | | | | | | | | | | - Fix the setup step (the process has changed now that we're using pytest) - Skip tests that are unstable - Make better use of build caching Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | Merge pull request #742 from aanand/fix-dockerignore-integration-testJoffrey F2015-08-271-15/+21
|\ \ | |/ |/| Fix .dockerignore integration test
| * Fix .dockerignore integration testAanand Prasad2015-08-261-15/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | - There was a typo (".dockerginore"), which meant that the exclusion of the .dockerignore file itself wasn't being tested. - Some of the file names were non-descriptive. - The test was inspecting the output of the build process, rather than running 'ls' in a new container, which meant it was full of extra output, and would fail when there was a cache hit. Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | Merge branch 'master' of github.com:docker/docker-pyJoffrey F2015-08-261-0/+34
|\ \
| * \ Merge pull request #662 from stevenewey/exec_create_userJoffrey F2015-08-261-0/+34
| |\ \ | | | | | | | | Exec create user
| | * \ Merge branch 'master' into exec_create_userStephen Newey2015-08-124-83/+267
| | |\ \
| | * | | Add test for root user as default exec_create behaviourStephen Newey2015-07-021-0/+17
| | | | |
| | * | | Add support for user on exec_create.Stephen Newey2015-06-301-0/+17
| | | | |
* | | | | 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-263-20/+202
|\ \ \ \ \ | | | | | | | | | | | | Better support for .dockerignore
| * | | | | Better support for .dockerignoreAanand Prasad2015-08-263-20/+202
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
| | | | |
* | | | | Test valid no args for log configMazz Mosley2015-08-261-2/+41
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
* | | | | Remove validation of supported log driversMazz Mosley2015-08-262-14/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | Fix log driver integration testMazz Mosley2015-08-261-20/+15
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By using `json-file` as the use case we can run this without needing to be on a machine with syslog installed. Even if syslog was installed, this test was still failing as the `log_opt` of 'key1' is an invalid option. This test is slightly different style to the others, it hopefully includes an example of how to space out tests for increased readability, we construct our tests in 3 phases(generally) and include a space imbetween them: - setup - perform action - assertions Expanded variable names is important for readability/clarity. Also reduced the number of assertions to focus on the logic we're testing. Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
* | | | Ensure Makefile still run tests properly / tests are run in container as ↵Joffrey F2015-08-251-1/+1
| | | | | | | | | | | | | | | | expected
* | | | Merge branch 'pytest' of https://github.com/aanand/docker-py into aanand-pytestJoffrey F2015-08-253-230/+108
|\ \ \ \
| * | | | Use pytest helpers to assert exceptions and deprecated warningsAanand Prasad2015-08-252-218/+104
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
| * | | | Run tests with pytestAanand Prasad2015-08-253-12/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | | | | Merge pull request #735 from aanand/test-network-mode-versionJoffrey F2015-08-251-5/+7
|\ \ \ \ \ | | | | | | | | | | | | Explicitly test NetworkMode logic in create_host_config
| * | | | | Explicitly test NetworkMode logic in create_host_configAanand Prasad2015-08-251-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | | | | | Merge pull request #736 from aanand/propagate-exceptions-in-testsJoffrey F2015-08-251-661/+347
|\ \ \ \ \ \ | | |/ / / / | |/| | | | Stop catching Exception in tests where it isn't expected
| * | | | | Stop catching Exception in tests where it isn't expectedAanand Prasad2015-08-251-661/+347
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | The test runner will report on the exception anyway, so it's redundant. Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | | | | Call Client.create_host_config because the old call is deprecatedBryan Boreham2015-08-251-12/+12
|/ / / / | | | | | | | | | | | | Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
* | | | Merge pull request #732 from docker/version-dependent-hostconfigAanand Prasad2015-08-252-49/+63
|\ \ \ \ | | | | | | | | | | Version dependent hostconfig
| * | | | Adapt tests to new create_host_config usageJoffrey F2015-08-242-49/+63
| | | | |
* | | | | Split the entrypoint string to shell-like syntax.Colin Huang2015-08-251-2/+2
|/ / / /
* | | | Added support for cgroup parentMohit Soni2015-08-241-0/+18
| | | | | | | | | | | | | | | | Clean up cgroup_parent usage
* | | | 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-102-11/+25
|\ \ \ | | | | | | | | `network_mode` now necessary in `host_config`
| * | | Fixed empty_host_config testJoffrey F2015-07-291-1/+1
| | | |
| * | | nit: parenthesis alignmentJoffrey F2015-07-291-6/+12
| | | |
| * | | Add netmode (required by docker)John Howard2015-07-281-10/+18
| | | | | | | | | | | | | | | | Signed-off-by: John Howard <jhoward@microsoft.com>
* | | | 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.
* | | Merge pull request #685 from paulbellamy/masterJoffrey F2015-07-211-2/+2
|\ \ \ | | | | | | | | Fix integration tests
| * | | Fix integration tests.Paul Bellamy2015-07-211-2/+2
| |/ / | | | | | | | | | | | | | | | Forgot to update them in 33e1a58 Signed-off-by: Paul Bellamy <paul.a.bellamy@gmail.com>
* | | Merge pull request #680 from aanand/fix-timestamp-conversionJoffrey F2015-07-211-1/+1
|\ \ \ | |/ / |/| | Enforce UTC datetimes in arguments to `events()`
| * | Enforce UTC datetimes in arguments to `events()`Aanand Prasad2015-07-211-1/+1
| | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | | Merge pull request #674 from estesp/use-docker-host-in-testsAanand Prasad2015-07-211-3/+4
|\ \ \ | | | | | | | | Update all client instances in integration tests to use DOCKER_HOST
| * | | Update all client instances in integration tests to use DOCKER_HOSTPhil Estes2015-07-141-3/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In testing Docker master with the latest docker-py release, a few new tests exist which don't set the base_url, which is not the default unix socket location when Docker's integration tests are running. Also, there is no guarantee syslog can be reached from a test container so I wrapped that test with the NOT_ON_HOST skip logic. Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
* | | Stop pinging registries from the clientAanand Prasad2015-07-202-4/+93
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Fix handling output from tty-enabled containers.Dan O'Reilly2015-07-062-6/+44
| | | | | | | | | | | | | | | | | | | | | | | | Treat output from TTY-enabled containers as raw streams, rather than as multiplexed streams. The docker API docs specify that tty-enabled containers don't multiplex. Also update tests to pass with these changes, and changed the code used to read raw streams to not read line-by-line, and to not skip empty lines. Addresses issue #630 Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
* | Merge pull request #651 from docker/fix_647Joffrey F2015-06-301-2/+7
|\ \ | | | | | | Fix adapter bug + regression test
| * | Fix Unix socket adapter bug with double slash in path + regression testfix_647Joffrey F2015-06-301-2/+7
| |/
View Lorry Controller Status