summaryrefslogtreecommitdiff
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Fix integration tests.Paul Bellamy2015-07-211-2/+2
| |/ / | | | | | | | | | | | | | | | Forgot to update them in 33e1a58 Signed-off-by: Paul Bellamy <paul.a.bellamy@gmail.com>
* | | Merge pull request #680 from aanand/fix-timestamp-conversionJoffrey F2015-07-211-1/+1
|\ \ \ | |/ / |/| | Enforce UTC datetimes in arguments to `events()`
| * | Enforce UTC datetimes in arguments to `events()`Aanand Prasad2015-07-211-1/+1
| | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | | Merge pull request #674 from estesp/use-docker-host-in-testsAanand Prasad2015-07-211-3/+4
|\ \ \ | | | | | | | | Update all client instances in integration tests to use DOCKER_HOST
| * | | Update all client instances in integration tests to use DOCKER_HOSTPhil Estes2015-07-141-3/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
* | | Stop pinging registries from the clientAanand Prasad2015-07-202-4/+93
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The daemon already pings the registry, so doing it on our end is redundant and error-prone. The `insecure_registry` argument to `push()`, `pull()` and `login()` has been deprecated - in the latter case, it wasn't being used anyway. The `insecure` argument to `docker.auth.resolve_repository_name()` has also been deprecated. `docker.utils.ping_registry()` has been deprecated. `docker.auth.expand_registry_url()` has been removed. Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | Fix handling output from tty-enabled containers.Dan O'Reilly2015-07-062-6/+44
| | | | | | | | | | | | | | | | | | | | | | | | Treat output from TTY-enabled containers as raw streams, rather than as multiplexed streams. The docker API docs specify that tty-enabled containers don't multiplex. Also update tests to pass with these changes, and changed the code used to read raw streams to not read line-by-line, and to not skip empty lines. Addresses issue #630 Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
* | Merge pull request #651 from docker/fix_647Joffrey F2015-06-301-2/+7
|\ \ | | | | | | Fix adapter bug + regression test
| * | Fix Unix socket adapter bug with double slash in path + regression testfix_647Joffrey F2015-06-301-2/+7
| |/
* | Merge pull request #644 from docker/memory-memswap-hostconfigJoffrey F2015-06-301-53/+56
|\ \ | |/ |/| memory / memswap in hostconfig
| * Updated tests for mem_limit changesmemory-memswap-hostconfigJoffrey F2015-06-191-53/+56
| |
* | Merge branch 'id-resolution-in-check-resource' of ↵Joffrey F2015-06-301-18/+20
|\ \ | | | | | | | | | https://github.com/posita/docker-py into posita-id-resolution-in-check-resource
| * | Move image/container ID resolution to @check_resource decorator.Matt Bogosian2015-05-201-18/+20
| | |
* | | Fix stop timeout bugfix_649Joffrey F2015-06-241-0/+5
| |/ |/|
* | Merge branch 'allow-any-mode' of https://github.com/aanand/docker-py into ↵Joffrey F2015-06-181-0/+47
|\ \ | | | | | | | | | aanand-allow-any-mode
| * | Allow any mode string to be passed into a volume bindAanand Prasad2015-06-051-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | Volume binds now take a "mode" key, whose value can be any string. "ro" is still supported. It is an error to specify both "ro" and "mode". Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | | Bumped default API version == 1.19Joffrey F2015-06-181-1/+1
| | |
* | | Add volume_driver param to client.create_containerLuke Marsden2015-06-181-0/+31
| | | | | | | | | | | | | | | | | | | | | - Add appropriate test which also asserts that volume names can be passed through to drivers. - Add new param to docs. Signed-off-by: Luke Marsden <luke@clusterhq.com>
* | | Fixed integration testJoffrey F2015-06-181-1/+1
| | |
* | | Allow binds to be specified as a list of stringsAanand Prasad2015-06-121-0/+30
|/ / | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | Merge pull request #562 from smothiki/memsJoffrey F2015-05-201-1/+7
|\ \ | |/ |/| make memory units compatible with native docker cli
| * make memory units compatible with native docker clismothiki2015-05-071-1/+7
| | | | | | | | Signed-off-by: sivaram mothiki <smothiki@engineyard.com>
* | Separate check_resource inspect testsJoffrey F2015-05-201-13/+20
| |
* | Fix #602. Raise ValueError on empty argument to inspect_{container,image}() ↵Matt Bogosian2015-05-171-0/+12
| | | | | | | | methods.
* | Merge pull request #593 from docker/deprecate_start_hostconfigJoffrey F2015-05-082-501/+186
|\ \ | | | | | | Deprecate start hostconfig
| * | Added deprecation warning for host config in startJoffrey F2015-05-082-501/+186
| |/
* | unit testcpusetcpusJoffrey F2015-05-081-0/+1
|/
* Fixes for #586Joffrey F2015-05-061-0/+2
|
* exec_resize is incorrectly passing param as jsonXiaojian Huang2015-04-281-16/+4
|
* Fix #573Joffrey F2015-04-281-2/+8
|
* Added unit tests for container limits in buildJoffrey F2015-04-271-0/+19
|
* * Separate file to store constantsJoffrey F2015-04-271-69/+71
| | | | * Added container_limits param to Client.build
* Updated exec API documentationexec_reworkJoffrey F2015-04-271-1/+0
|
* Exec API testsJoffrey F2015-04-273-27/+147
|
* Added check_resource decorator to interrupt command if container or image ↵Joffrey F2015-04-241-0/+15
| | | | argument is None
* 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>
View Lorry Controller Status