6c0f7187a8
Integration test improvements
...
- 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>
2015-08-31 12:06:41 -07:00
63df0b9ab3
Merge branch 'master' of github.com:docker/docker-py
2015-08-26 17:02:55 -07:00
0282e120ea
Merge branch 'aanand-default-cert-path'
2015-08-26 17:02:39 -07:00
e8af8b376d
Use cross-platform home directory path
2015-08-26 17:02:24 -07:00
c56c9faacd
Merge branch 'default-cert-path' of https://github.com/aanand/docker-py into aanand-default-cert-path
...
Conflicts:
tests/utils_test.py
2015-08-26 17:00:33 -07:00
db1a93fd27
Merge pull request #662 from stevenewey/exec_create_user
...
Exec create user
2015-08-26 15:36:47 -07:00
ddf879cc4c
Merge pull request #721 from aanand/pathspec
...
Better support for .dockerignore
2015-08-26 14:25:09 -07:00
40a7f37b9d
Merge branch 'mnowster-remove-driver-types'
2015-08-26 11:51:30 -07:00
e7a9ae097c
Don't remove LogConfig.types shortcut
2015-08-26 11:51:08 -07:00
20e142fe78
Better support for .dockerignore
...
- 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>
2015-08-26 19:14:09 +01:00
9937a31a88
Test valid no args for log config
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-08-26 16:10:28 +01:00
35b30e69df
Remove validation of supported log drivers
...
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>
2015-08-26 16:02:03 +01:00
90538cf0a3
Fix log driver integration test
...
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>
2015-08-26 15:58:57 +01:00
d60cb3172e
Merge branch 'aanand-pytest'
2015-08-25 16:58:16 -07:00
b5f1e64e8f
Ensure Makefile still run tests properly / tests are run in container as expected
2015-08-25 16:58:01 -07:00
f9a540aa77
Merge branch 'pytest' of https://github.com/aanand/docker-py into aanand-pytest
2015-08-25 16:10:47 -07:00
47e0ad6959
Merge pull request #735 from aanand/test-network-mode-version
...
Explicitly test NetworkMode logic in create_host_config
2015-08-25 14:57:59 -07:00
1308049d2f
Merge pull request #736 from aanand/propagate-exceptions-in-tests
...
Stop catching Exception in tests where it isn't expected
2015-08-25 14:56:49 -07:00
30a6be051e
Merge pull request #738 from bboreham/fix-deprecated-call
...
Call Client.create_host_config because the old call is deprecated
2015-08-25 14:54:50 -07:00
d5bcdaf2f8
Use pytest helpers to assert exceptions and deprecated warnings
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-25 16:34:33 +01:00
6e27c2a3d0
Run tests with pytest
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-25 16:34:33 +01:00
4e4c342582
Call Client.create_host_config because the old call is deprecated
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2015-08-25 16:19:51 +01:00
36424ca001
Stop catching Exception in tests where it isn't expected
...
The test runner will report on the exception anyway, so it's redundant.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-25 16:00:42 +01:00
113901c8e3
Prevent users from attempting to override 'version'
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-25 14:34:42 +01:00
41c21676a2
Explicitly test NetworkMode logic in create_host_config
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-25 14:11:21 +01:00
d9a149f327
Merge pull request #732 from docker/version-dependent-hostconfig
...
Version dependent hostconfig
2015-08-25 14:03:51 +01:00
4d2c15fad1
Merge pull request #733 from ColinHuang/doc
...
Add resize API in doc
2015-08-25 14:53:40 +02:00
747c1ca290
Merge pull request #734 from ColinHuang/master
...
Split the entrypoint string to shell-like syntax.
2015-08-25 14:53:17 +02:00
edebf3756a
Split the entrypoint string to shell-like syntax.
2015-08-25 09:44:47 +08:00
1cb8894024
Add resize API in doc
2015-08-25 09:40:21 +08:00
75e3b8bb71
Update HostConfig docs
2015-08-24 16:28:26 -07:00
595965ebc4
Adapt tests to new create_host_config usage
2015-08-24 16:25:18 -07:00
4bd3c48ea1
Add version param to utils.create_host_config
...
Add create_host_config and create_container_config to Client for version
awareness
Trigger warning when create_host_config is used without version
2015-08-24 16:22:59 -07:00
9bb6a6fd56
Merge branch 'mohitsoni-master'
2015-08-24 14:43:36 -07:00
3caaa0050b
Added support for cgroup parent
...
Clean up cgroup_parent usage
2015-08-24 14:43:05 -07:00
4008cbce71
Merge pull request #711 from ClusterHQ/exec_inspect_version
...
Change minimum API version for exec_inspect
2015-08-24 14:19:20 -07:00
cfb20f8d50
Merge pull request #728 from aanand/debug-auth
...
Add logging for auth loading/resolution
2015-08-24 14:03:14 -07:00
8ba85ac26f
Merge pull request #727 from mark-adams/fixes-726
...
Fixed #726 issue where split_port was checking `len(None)`
2015-08-20 10:56:54 -07:00
b5368ad8b9
Add logging for auth loading/resolution
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-20 16:57:40 +01:00
b7aa1d76eb
Fixed #726 issue where split_port was checking `len(None)`
...
- 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
2015-08-19 22:01:44 -05:00
a6064e356e
Merge pull request #724 from bedwards/bedwards-fluentd-patch
...
Update types.py to support fluentd logging driver
2015-08-18 12:33:13 -07:00
c135266233
add gelf and fluentd logging drivers to types.py
2015-08-18 14:26:32 -05:00
3cd66b66ba
Merge pull request #719 from docker/allow-path-in-host
...
Allow docker host (base_url) to contain a path
2015-08-18 11:16:09 +01:00
adb2d01861
Added full path parse_host unit test
2015-08-17 14:45:35 -07:00
570693c810
Allow docker host (base_url) to contain a path
2015-08-17 14:36:19 -07:00
7ba83323b6
Update error message to state that exec_inspect is not supported
2015-08-12 23:24:52 +01:00
1c1d7eee5a
Merge branch 'master' into exec_create_user
2015-08-12 18:12:56 +01:00
c697f0c26c
Merge pull request #1 from docker/master
...
Update to latest master
2015-08-12 19:11:27 +02:00
2febf104a0
Change unnecessary user=None in args to empty string and remove check.
2015-08-12 18:08:12 +01:00
eb29b424b0
Change minimum API version for exec_inspect
2015-08-12 11:53:34 +01:00
Aanand Prasad
Joffrey F
Joffrey F
Mazz Mosley
Bryan Boreham
Maxime Petazzoni
Colin Huang
Mohit Soni
Mark Adams
Brian Edwards
Bridget McErlean
Stephen Newey