e5fbc42dcb
Merge pull request #763 from docker/api_splitup
...
API splitup
2015-09-13 08:47:07 -07:00
c735cc69a0
Split different APIs into several mixins for clarity / easier maintenance
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-11 16:19:29 -07:00
7e3cdfb3b1
Fixed regression test in py3 environments
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-10 11:37:51 -07:00
de5aab87b4
Merge pull request #753 from docker/715-user-int-uid
...
Always send a string for the user param in create_container
2015-09-10 10:37:05 -07:00
b1c2475698
Add hello-world to temp images in pull tests
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-09 17:10:04 -07:00
1fb2db4951
Make integration tests more CI-friendly.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-09 17:06:34 -07:00
fa3082b6cd
Update integration-dind task
2015-09-09 14:49:58 -07:00
abaf346b49
Make running integration tests with dind possible
2015-09-09 14:49:36 -07:00
7dce129180
Merge pull request #754 from aanand/default-to-tcp-url-on-windows
...
Default to 127.0.0.1:2375 on Windows
2015-09-01 16:36:32 -07:00
1362938f03
Default to 127.0.0.1:2375 on Windows
...
Following the logic of the Docker client.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-09-01 16:28:05 -07:00
1e916a1e83
Test UID validity
2015-08-31 18:35:32 -07:00
09defa66ba
Always send a string for the user param in create_container
2015-08-31 16:06:52 -07:00
3d884f9a3c
Test URL construction
2015-08-31 15:01:40 -07:00
33acb9d2e0
Test has been fixed, remove skip decorator
2015-08-31 13:13:46 -07:00
ad608baaaf
Merge pull request #747 from aanand/integration-test-fixes
...
Integration test improvements
2015-08-31 13:07:02 -07:00
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
9b37120167
Merge pull request #742 from aanand/fix-dockerignore-integration-test
...
Fix .dockerignore integration test
2015-08-27 11:01:47 -07:00
63df0b9ab3
Merge branch 'master' of github.com:docker/docker-py
2015-08-26 17:02:55 -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
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
ced9b0094f
Fix .dockerignore integration test
...
- 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>
2015-08-26 16:03:21 +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
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
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
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
edebf3756a
Split the entrypoint string to shell-like syntax.
2015-08-25 09:44:47 +08:00
595965ebc4
Adapt tests to new create_host_config usage
2015-08-24 16:25:18 -07:00
3caaa0050b
Added support for cgroup parent
...
Clean up cgroup_parent usage
2015-08-24 14:43:05 -07: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
adb2d01861
Added full path parse_host unit test
2015-08-17 14:45:35 -07:00
1c1d7eee5a
Merge branch 'master' into exec_create_user
2015-08-12 18:12:56 +01:00
139850f3f3
Merge pull request #698 from docker/jhowardmsft-14530-netmode
...
`network_mode` now necessary in `host_config`
2015-08-10 10:53:57 -07:00
d400717ff8
Squashed commit of the following:
...
commit 4f053a06c1e9e3f63fd5afde60322f676acbdf45
Merge: 9177380 07a99eahttps://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.
2015-07-30 14:39:37 +01:00
2b7c31e0f7
Fixed empty_host_config test
2015-07-29 14:23:10 -07:00
daea185a23
nit: parenthesis alignment
2015-07-29 12:43:39 -07:00
8f1a82faeb
Add netmode (required by docker)
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-07-28 15:18:12 -07:00
8a87001d09
Merge pull request #685 from paulbellamy/master
...
Fix integration tests
2015-07-21 11:01:11 -07:00
42b712d100
Merge pull request #680 from aanand/fix-timestamp-conversion
...
Enforce UTC datetimes in arguments to `events()`
2015-07-21 10:45:29 -07:00
Maxime Petazzoni