summaryrefslogtreecommitdiff
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Added tests for log_config paramlogconfig-supportJoffrey F2015-04-242-2/+47
|
* Handle ID truncate on client side in containers list (and changed default ↵client_side_truncJoffrey F2015-04-222-5/+9
| | | | from True to False)
* revertJoffrey F2015-04-221-6/+0
|
* Added integration testJoffrey F2015-04-222-0/+35
|
* Improved ulimit testsJoffrey F2015-04-222-1/+26
|
* assertRaises 2.6 compatJoffrey F2015-04-221-6/+3
|
* Add tests for ulimitsJoffrey F2015-04-221-4/+34
|
* BaseTestCase shims assertInJoffrey F2015-04-222-2/+14
|
* Merge branch 'sam/import-improvements' of ↵Joffrey F2015-04-223-16/+177
|\ | | | | | | | | | | | | | | | | https://github.com/ssssam/docker-py into ssssam-sam/import-improvements Conflicts: docker/client.py docker/unixconn/unixconn.py tests/integration_test.py
| * Add integration tests for Client.import_image() functionSam Thursfield2015-01-051-2/+160
| | | | | | | | | | | | Currently TestImportFromStream fails, because something is going wrong with the HTTP chunked transfer-encoding. This didn't work before, either (for a different reason).
| * Rewrite Client.import_image() and add less-magical versionsSam Thursfield2015-01-051-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than have one function that can do 5 things and attempts to guess what the user wanted, it's good to have a function for each possible method of importing an image. Error cases are handled a lot better this way. The unit test test_import_image_from_file() was changed to be test_import_image_from_bytes(), because if we try to import a temporary file in the test, the 'data' parameter of the 'fake_request' object is an instance of a funny internal type like <_io.BufferedReader name='/tmp/tmpc9chux'> and it's very hard to match such a thing with `mock.assert_called_with()`.
| * Rework Unix connection code so that 'chunked' transfers workSam Thursfield2015-01-052-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows streaming a system to the 'import' command, rather than having to read the whole thing into memory before sending it. Previously both the UnixAdapter and the docker.Client objects would track the 'base URL' of the Docker daemon (socket path in the case of local Unix-domain socket connections). The Client object would construct URLs which contained the path to the socket with the path of the Docker API call appended. The UnixHTTPConnection instance would then remove the known socket path from the URL. This relied on all calls going through the HTTPConnection.request() function, where the URL could be rewritten. In the case of 'chunked' HTTP POST requests this doesn't happen, so such calls would request a path still including the socket path and would receive a 404 error. The client now constructs URLs containing just the path of the desired API endpoint, and expects the Unix socket transport to know the path to the Docker daemon's socket.
* | line lengthYuval Kohavi2015-04-111-3/+8
| | | | | | | | Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
* | python 2.6 compatibleYuval Kohavi2015-04-111-6/+3
| | | | | | | | Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
* | Adding port utils to split port rangesYuval Kohavi2015-04-031-0/+95
| | | | | | | | Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
* | Use assertRaises in a backward compatible fashionJoffrey F2015-03-251-2/+4
| |
* | Added assertIn shim for py2.6Joffrey F2015-03-251-0/+5
| |
* | docs and unit test for security_optJoffrey F2015-03-251-0/+13
| |
* | Finish labels implementation, add tests and docsAanand Prasad2015-03-201-0/+48
| | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | Update default API version to 1.18Aanand Prasad2015-03-201-2/+2
| | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | Fix unit testsJoffrey F2015-03-051-1/+2
| |
* | Auto-detect integration testsJoffrey F2015-03-051-0/+22
| |
* | detect server version when version="auto"Tomas Tomecek2015-03-052-1/+27
| | | | | | | | | | | | heavily inspired by PR#281 Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
* | Properly close files and sockets in unit testsRoman Mohr2015-02-281-32/+31
| |
* | Merge pull request #502 from cpuguy83/498_dockerignore_special_namesJoffrey F2015-02-271-0/+4
|\ \ | | | | | | Add special cases for .dockerignore
| * | Add special cases for .dockerignoreBrian Goff2015-02-241-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge pull request #509 from docker/lxc_driver_test_compatJoffrey F2015-02-271-4/+16
|\ \ \ | | | | | | | | Lxc driver test compat
| * | | I suck at pythonlxc_driver_test_compatJoffrey F2015-02-261-5/+5
| | | |
| * | | Ensure integration tests work with LXC exec driverJoffrey F2015-02-261-4/+16
| |/ /
* | | Merge pull request #508 from docker/de-i11003Joffrey F2015-02-271-1/+5
|\ \ \ | | | | | | | | Rename test fix to take into account docker/docker#11003
| * | | Rename test fix to take into account docker/docker#11003de-i11003Joffrey F2015-02-261-1/+5
| |/ /
* | | Update resolve_authconfig to bring it in line with Docker clientAanand Prasad2015-02-271-1/+11
|/ / | | | | | | | | | | | | Instead of expanding the registry name we're looking for to a full URL, strip entries in the authconfig down to just the hostname. Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | Resolves #497 - add support for dockerfileDaniel Nephin2015-02-201-0/+6
| | | | | | | | Signed-off-by: Daniel Nephin <dnephin@gmail.com>
* | Fix several DOCKER_HOST assumptions in integration_test.pyTianon Gravi2015-02-161-2/+2
| |
* | Fix pep8 error1.0.0Joffrey F2015-02-161-2/+2
| |
* | FormattingJoffrey F2015-02-121-149/+129
| |
* | Merge branch 'add-stats-api-support' of https://github.com/nir0s/docker-py ↵Joffrey F2015-02-124-1/+175
|\ \ | | | | | | | | | into nir0s-add-stats-api-support
| * | minornir0s2015-02-121-2/+2
| | |
| * | removed aggregation for now and added a unit test. also using stream_helper nownir0s2015-02-123-0/+174
| | |
| * | added initial support for stats retrievalnir0s2015-02-111-1/+1
| | |
* | | pid_mode integration testspid_modeJoffrey F2015-02-111-0/+31
| | |
* | | Merge pull request #480 from ggtools/eventsJoffrey F2015-02-112-1/+61
|\ \ \ | | | | | | | | Add missing options to the events command
| * | | Fix datetime issue with Python 2.6Christophe Labouisse2015-02-111-3/+4
| | | | | | | | | | | | | | | | Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
| * | | Add missing options to the events commandChristophe Labouisse2015-02-112-1/+60
| |/ / | | | | | | | | | | | | | | | | | | - Add since, until and filters parameters to `Client.events` - Add missing `events`command in the documentation Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
* | | read_only parameterread_only_rootfsJoffrey F2015-02-101-0/+27
|/ /
* | Merge pull request #482 from docker/rename_containerJoffrey F2015-02-103-1/+35
|\ \ | | | | | | New Client.rename() method
| * | rename() tests and docsrename_containerJoffrey F2015-02-103-1/+35
| | |
* | | Fix crash when building from remote sourcesVincent Giersch2015-02-041-0/+14
|/ / | | | | | | | | | | | | Avoid crashing when the Docker python client is able to load registry credentials when building using a remote source Signed-off-by: Vincent Giersch <vincent.giersch@ovh.net>
* | Additional tests and small improvement to auth.resolve_authconfigJoffrey F2015-02-011-0/+55
| |
* | Add Support for Mac AddressJames Harris2015-01-213-1/+31
| | | | | | | | | | | | 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>
View Lorry Controller Status