docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,189 Commits 23 Branches 129 Tags 8.9 MiB
Commit Graph

125 Commits

Author SHA1 Message Date
Joffrey F 7e3cdfb3b1 Fixed regression test in py3 environments 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-09-10 11:37:51 -07:00
Joffrey F 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
Joffrey F 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
Joffrey F 1fb2db4951 Make integration tests more CI-friendly. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-09-09 17:06:34 -07:00
Joffrey F abaf346b49 Make running integration tests with dind possible 2015-09-09 14:49:36 -07:00
Joffrey F 1e916a1e83 Test UID validity 2015-08-31 18:35:32 -07:00
Joffrey F 09defa66ba Always send a string for the user param in create_container 2015-08-31 16:06:52 -07:00
Joffrey F 33acb9d2e0 Test has been fixed, remove skip decorator 2015-08-31 13:13:46 -07:00
Joffrey F ad608baaaf Merge pull request #747 from aanand/integration-test-fixes 
Integration test improvements
 2015-08-31 13:07:02 -07:00
Aanand Prasad 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
Joffrey F 9b37120167 Merge pull request #742 from aanand/fix-dockerignore-integration-test 
Fix .dockerignore integration test
 2015-08-27 11:01:47 -07:00
Joffrey F db1a93fd27 Merge pull request #662 from stevenewey/exec_create_user 
Exec create user
 2015-08-26 15:36:47 -07:00
Mazz Mosley 9937a31a88 Test valid no args for log config 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-08-26 16:10:28 +01:00
Aanand Prasad 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
Mazz Mosley 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
Mazz Mosley 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
Joffrey F b5f1e64e8f Ensure Makefile still run tests properly / tests are run in container as expected 2015-08-25 16:58:01 -07:00
Bryan Boreham 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
Stephen Newey 1c1d7eee5a Merge branch 'master' into exec_create_user 2015-08-12 18:12:56 +01:00
Joffrey F daea185a23 nit: parenthesis alignment 2015-07-29 12:43:39 -07:00
John Howard 8f1a82faeb Add netmode (required by docker) 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-07-28 15:18:12 -07:00
Paul Bellamy 7de1605e9a Fix integration tests. 
Forgot to update them in 33e1a58

Signed-off-by: Paul Bellamy <paul.a.bellamy@gmail.com>
 2015-07-21 12:07:22 +01:00
Phil Estes f321eef031 Update all client instances in integration tests to use DOCKER_HOST 
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)
 2015-07-14 13:00:35 -04:00
Stephen Newey 7bbec93f64 Add test for root user as default exec_create behaviour 2015-07-02 13:24:51 +01:00
Joffrey F 9e87884ba8 Fix Unix socket adapter bug with double slash in path + regression test 2015-06-30 23:59:03 +02:00
Stephen Newey 6a5a256509 Add support for user on exec_create. 2015-06-30 13:23:42 +01:00
Joffrey F 30fac5b879 Fix stop timeout bug 2015-06-24 22:58:56 +02:00
Joffrey F 6b9ea106d7 Fixed integration test 2015-06-18 19:58:01 +02:00
Joffrey F 2fd2eebcb0 Added deprecation warning for host config in start 2015-05-08 14:00:58 -07:00
Joffrey F 070cbece0a Fixes for #586 2015-05-06 17:53:53 -07:00
Joffrey F e2ad91bdf7 Exec API tests 2015-04-27 13:57:15 -07:00
Joffrey F c7948436e5 Added tests for log_config param 2015-04-24 15:10:51 -07:00
Joffrey F 6228929a88 Handle ID truncate on client side in containers list (and changed default from True to False) 2015-04-22 18:00:53 -07:00
Joffrey F d0a49ec3b8 Added integration test 2015-04-22 17:43:36 -07:00
Joffrey F d71bfb1b3d Improved ulimit tests 2015-04-22 15:45:49 -07:00
Joffrey F a5519022d9 Merge branch 'sam/import-improvements' of https://github.com/ssssam/docker-py into ssssam-sam/import-improvements 
Conflicts:
	docker/client.py
	docker/unixconn/unixconn.py
	tests/integration_test.py
 2015-04-22 11:50:45 -07:00
Joffrey F acfa99dd10 Auto-detect integration tests 2015-03-05 12:08:41 -08:00
Joffrey F 39ee5981b4 Merge pull request #502 from cpuguy83/498_dockerignore_special_names 
Add special cases for .dockerignore
 2015-02-27 11:56:19 -08:00
Joffrey F 91985b2397 Merge pull request #509 from docker/lxc_driver_test_compat 
Lxc driver test compat
 2015-02-27 11:48:36 -08:00
Joffrey F 8d2b71fa7e I suck at python 2015-02-26 17:54:19 -08:00
Joffrey F e255c10f57 Ensure integration tests work with LXC exec driver 2015-02-26 17:39:44 -08:00
Joffrey F 21cc9916fd Rename test fix to take into account docker/docker#11003 2015-02-26 17:16:36 -08:00
Brian Goff ce40730b42 Add special cases for .dockerignore 
Fixes #498
Allowing `Dockerfile` and `.dockerignore` in the exclusion filter
completely breaks the build on docker < 1.5

In Docker 1.5 these entries are treated as special cases when included
in the .dockerignore and are still sent as part of the context. The
daemon ends up excluding them from any `ADD`, `COPY`, and cache
validation.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-02-24 15:48:51 -05:00
Tianon Gravi 7f49cf1279 Fix several DOCKER_HOST assumptions in integration_test.py 2015-02-16 16:42:34 -07:00
Joffrey F 7084802da2 Fix pep8 error 2015-02-16 10:56:08 -08:00
Joffrey F 1a7e3a2d6d Merge branch 'add-stats-api-support' of https://github.com/nir0s/docker-py into nir0s-add-stats-api-support 2015-02-12 13:15:59 -08:00
Joffrey F cab37b604a pid_mode integration tests 2015-02-11 12:16:36 -08:00
nir0s f402af551d added initial support for stats retrieval 2015-02-11 22:04:32 +02:00
Joffrey F e379e8ae24 read_only parameter 2015-02-10 16:13:09 -08:00
Joffrey F a7f7fbb0fd rename() tests and docs 2015-02-10 12:55:44 -08:00