Commit Graph

145 Commits

Author SHA1 Message Date
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
James Harris 301515ed56 Add Support for Mac Address
The new docker api allows specifing mac address for containers. This change is to allow docker py the same functionality.

Signed-off-by: James Harris <james@rancher.com>
2015-01-21 16:08:16 -07:00
Joffrey F aa19d7b660 Fixed TestRestartingContainer 2015-01-13 10:32:28 -08:00
Joffrey F 1f8cde8560 Integration tests fixes 2015-01-09 14:22:55 -08:00
Joffrey F 43c334656b Added RO volumes tests 2015-01-08 18:02:03 -08:00
Joffrey F 4d3e7eb1cb Merge branch 'master' of https://github.com/rmohr/docker-py into rmohr-master 2015-01-08 16:23:21 -08:00
Joffrey F 09ea71971c Fix for issue #443 2015-01-08 15:57:44 -08:00
Sam Thursfield b1d4a5d8d1 Add integration tests for Client.import_image() function
Currently TestImportFromStream fails, because something is going wrong
with the HTTP chunked transfer-encoding. This didn't work before,
either (for a different reason).
2015-01-05 12:33:36 +00:00
Roman Mohr 2d34c38c4d Keep unix socket alive with python3 2014-12-21 11:42:41 +01:00
Joffrey F 53d61a77b6 Improved integration tests to run on python3 and close sessions after in tearDown phase 2014-12-18 17:46:41 -08:00
Davanum Srinivas d9fa43a9b7 flake8 fails with F821 for unicode under python 3.4.2 2014-12-18 11:08:37 -05:00
Joffrey F f75afc92a2 Use unicode() typecast instead of u'' literal (3.2 compat). Fixes #408 2014-12-17 12:07:35 -08:00
Joffrey F 2b5516afab Re-added integration tests with hostconfig in start 2014-12-17 11:44:52 -08:00
Joffrey F 66112561f4 Updated integration tests to use new host_config param 2014-12-17 11:44:51 -08:00
Joffrey F bf9e1c84ba Don't use old test image (deprecated ID scheme) 2014-12-15 14:52:51 -08:00
Joffrey F a4aa1a88f1 Better pull confirmation 2014-12-15 13:53:49 -08:00
Joffrey F 4b91a71313 Longer timeout when contacting hub 2014-12-15 12:11:54 -08:00
Joffrey F 1a3f3c1304 Fixed integration test 2014-11-03 23:52:03 +01:00
Joffrey F 213ca7d71d Merge branch 'feature_logs-tail' of github.com:totem/docker-py into totem-feature_logs-tail
Conflicts:
	docker/client.py
	tests/fake_api.py
2014-10-30 15:07:58 +01:00
Joffrey F 9b63cc548a Merge pull request #324 from infoxchange/clear-unixconn-pool
Clear UNIX connections pool to avoid ResourceWarnings
2014-10-30 13:49:40 +01:00
Joffrey F 37c8072f60 Merge branch 'pause-unpause' of github.com:phensley/docker-py into phensley-pause-unpause
Conflicts:
	README.md
	tests/integration_test.py
	tests/test.py
2014-10-29 19:35:05 +01:00
Patrick Hensley b365796439 Use shlex for exec string cmd, added integration testcase. 2014-10-22 13:44:41 -04:00
Patrick Hensley f95c8c4dfc Unit and integration tests for exec. 2014-10-17 16:06:14 -04:00
Patrick Hensley 288e53b28b Unit and integration tests for pause/unpause. 2014-10-04 23:46:33 -04:00
Alexey Kotlyarov aff1fbc506 Test resource warnings when using the client 2014-09-22 16:24:23 +10:00
Joffrey F ff8c9bb5fd Fixed integration tests 2014-09-08 17:22:32 +02:00
Shreyas Karnik c6046ac137 first cut of restart policy 2014-08-26 21:35:04 -05:00
sukrit007 c27a459e61 Add support for tailing logs (introduced in API : v1.13)
Updated default version to v1.13
2014-08-22 16:32:48 -07:00
Joffrey F 8e45264907 Merge pull request #268 from brutasse/265-dockerignore
Add support for .dockerignore
2014-07-23 20:25:07 +02:00
Bruno Renié 87b4d327d1 Add support for .dockerignore
Fixes #265.

Implementation is a bit more elaborate than docker's implementation and
matches with the one proposed in dotcloud/docker#6869 to handle permission
issues more nicely.
2014-07-23 15:05:53 +02:00
Michael Merickel e15b3bb689 allow docker client to connect to a remote host
to run the tests on a host without using the default unix socket, it's
now possible to specify:

    DOCKER_HOST=tcp://localdocker:4243 env/bin/python setup.py test
2014-07-07 10:03:42 -05:00
Michael Merickel 272c1f8634 support specifying location of temp folders
TestWithBinds was failing when shared folders are used because /tmp was
not shared from OS X to my VM. This fix allows the location of the temp
folders to be changed via:

    TMPDIR=$(pwd) env/bin/python setup.py test

This also properly cleans up temp folders which were sticking around
before.
2014-07-05 14:44:14 -05:00
Michael Merickel b5e75c4019 fix ListContainers which was failing with "executable true; not found" 2014-07-05 14:20:11 -05:00
Joffrey F 8a63e70bca Updated/fixed integration tests. Moved 'pull busybox' out of setUp(). Commented out logs streaming test 2014-06-20 20:57:29 +02:00
Joffrey F fb11abc8c6 Merge pull request #236 from rail44/feature-support-get-and-load-image
Support get and load image
2014-06-17 02:24:30 +02:00
Satoshi Amemiya 9461035d49 Support get and load image 2014-06-02 16:41:52 +09:00
Sam Riley d34b78aac5 Fix joining of unicode and byte strings in python3.
Check logs response in unit tests, and fix log integration tests for
py3.
2014-06-01 09:01:42 +01:00
Maxime Petazzoni 55b93d676b Merge pull request #210 from aanand/universally-compatible-chunking
Universally-compatible reading of chunked streams
2014-05-21 11:06:23 -07:00
Aanand Prasad 073fdaf671 Universally-compatible reading of chunked streams
Docker introduced newlines in stream output in version 0.9
(https://github.com/dotcloud/docker/pull/4276), but not to all
endpoints - POST /images/create, for example, does not include them.

This reverts to the old, less pleasant implementation of
_stream_helper(), with a manual check for newlines to fix the problem
described in #176 and fixed in #184, without the accompanying
regression. It should work against Docker 0.8, 0.9 and 0.10, both when
building and when pulling.
2014-04-28 17:22:14 +01:00
Aanand Prasad fdd39a85cc Fix integration test regression
The test for starting a container with volume binds hadn't been updated
to use the new dictionary structure for the `binds` argument.
2014-04-28 17:18:39 +01:00
Evgeniy L 18d4db09ec Moved APIError exception to docker.errors module. 2014-04-07 13:31:13 +04:00
shin- 8eedbc895e Fixed integration tests 2014-04-04 18:16:47 +02:00
shin- ad75b37a46 Merge branch 'volumes-from-as-list' of github.com:blackrobot/docker-py into blackrobot-volumes-from-as-list 2014-04-04 16:59:57 +02:00
shin- 54c904f806 Updated unit tests API version, flake8 fixes 2014-04-04 16:55:01 +02:00
Joseph Schorr 156d14efd1 Revert unneeded change 2014-04-04 16:47:23 +02:00
Joseph Schorr 9ae3bcd2f3 Make sure the build command in the client sends the auth credentials along. Required for "FROM " lines that pull from private registries 2014-04-04 16:47:23 +02:00
Damon Jablons cdd52a172f Added test for container with volumes_from 2014-04-01 16:08:25 -04:00
Evgeniy L 2a1484f655 Fixes for flake8
Next rules were broken
* E265 block comment should start with '# '
* E713 test for membership should be 'not in'
2014-03-28 23:08:22 +04:00
shin- 82f4c271ea Updated integration tests 2014-02-18 19:58:50 +01:00
Joffrey F 4bf75ded43 Merge pull request #119 from ureyes84/master
Updated port function
2014-01-16 11:19:34 -08:00
Maxime Petazzoni 32ad01e110 Rework auth config loading and use of auth data for login/pull/push
Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
2014-01-07 15:30:50 -08:00
Maxime Petazzoni ef009e114a Style fixes for flake8
Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
2013-12-24 10:07:25 -08:00
Fedor Korotkiy 09f95768f3 Fix infinite loop in Client.logs(stream=True) caused by connection close. 2013-12-24 12:01:16 +00:00
Ulises Reyes d8e0f5a66f Improves code style 2013-12-15 20:42:58 -05:00
Ulises Reyes 844e41088e Refactored test. It now makes 2 calls to port 2013-12-15 02:11:02 -05:00
Ulises Reyes daa3a1e2ef Shortened lines 2013-12-14 22:28:45 -05:00
Ulises Reyes a7c1449757 Improved assertions in the port test 2013-12-14 22:24:19 -05:00
Ulises Reyes f5924c3863 Updated the port function in order to parse the new NetworkSettings Port dict (fixes #88) 2013-12-14 22:00:08 -05:00
Peter Yu e361f4c1cd Privileged option is part of host config, not config 2013-11-18 21:47:33 +00:00
shin- 35d3a3c977 Merge branch 'timeout-support' of github.com:mpetazzoni/docker-py into mpetazzoni-timeout-support
Conflicts:
	docker/client.py
	tests/integration_test.py
	tests/test.py
2013-11-15 21:44:18 +01:00
shin- e694d5af3e Merge branch 'v65-2' of github.com:yukw777/docker-py into yukw777-v65-2
Fixed some tests

Conflicts:
	docker/client.py
	tests/fake_api.py
	tests/integration_test.py
	tests/test.py
2013-11-15 19:53:10 +01:00
shin- c0f84ceac0 Fix privileged test 2013-11-15 19:06:19 +01:00
shin- 2828833607 Merge branch 'master' of github.com:dotcloud/docker-py into yukw777-link
Fixed test_pull and test_pull_stream (don't assume headers content is empty)

Conflicts:
	tests/test.py
2013-11-15 18:21:49 +01:00
Daniel Graña 8561544e30 Add signal argument to kill command 2013-11-14 10:43:57 -02:00
Peter Yu 90d13d5fd2 links implemented. use v1.6 by default now 2013-11-12 16:09:29 +00:00
shin- 4f6f475fd5 Merge branch 'stream-pull-request' of github.com:yukw777/docker-py into yukw777-stream-pull-request 2013-11-11 19:48:52 +01:00
Peter Yu 6c2820835e many tests have been implemented 2013-11-10 02:14:53 +00:00
Peter Yu 97771b1b2b links implemented. use v1.6 by default now 2013-11-10 00:27:10 +00:00
Maxime Petazzoni a451119e4a Allow for configurable timeout on all client requests
Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
2013-11-08 15:19:51 -08:00
yukw777 fdd48cff81 pull, push, build are streamable 2013-11-08 21:08:46 +00:00
yukw777 e0df0c7ad2 pull, push, build are streamable 2013-11-08 19:22:23 +00:00
Maxime Petazzoni afb349d257 Add integration test for named container creation
Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
2013-11-07 15:37:41 -08:00
shin- acd2607407 Flake8 compliance + flake8 tests in tox.ini 2013-10-15 21:15:01 +02:00
shin- 0808905636 Refactoring, Python 3 compatibility, Tests working with python 3, cleaned up imports. 2013-10-15 19:19:20 +02:00
Deni Bertovic afbfc703ca integration test fix
make the mount point for shared.txt reside in the /tmp/ folder
because if it resides in the lib folder docker sets the owner of the
folder as root inside the container so then when the container exists
the test fails to cleanup and remove the shared.txt file, and breaks git as well.
2013-10-03 11:55:02 +02:00
Deni Bertovic 8047fb4cb4 reamed test.py to integration_test.py 2013-10-03 11:51:12 +02:00