summaryrefslogtreecommitdiff
path: root/tests/integration_test.py
Commit message (Collapse)AuthorAgeFilesLines
* Fixed regression test in py3 environments1.4.0-releaseJoffrey F2015-09-101-1/+4
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #753 from docker/715-user-int-uidJoffrey F2015-09-101-0/+6
|\ | | | | Always send a string for the user param in create_container
| * Test UID validity715-user-int-uidJoffrey F2015-08-311-1/+4
| |
| * Always send a string for the user param in create_containerJoffrey F2015-08-311-0/+3
| |
* | Add hello-world to temp images in pull testsci-fixesJoffrey F2015-09-091-0/+2
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Make integration tests more CI-friendly.Joffrey F2015-09-091-16/+10
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Make running integration tests with dind possibleJoffrey F2015-09-091-3/+4
|/
* Test has been fixed, remove skip decoratorJoffrey F2015-08-311-1/+0
|
* Merge pull request #747 from aanand/integration-test-fixesJoffrey F2015-08-311-45/+79
|\ | | | | Integration test improvements
| * Integration test improvementsAanand Prasad2015-08-311-45/+79
| | | | | | | | | | | | | | | | | | | | | | - 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>
* | Merge pull request #742 from aanand/fix-dockerignore-integration-testJoffrey F2015-08-271-15/+21
|\ \ | |/ |/| Fix .dockerignore integration test
| * Fix .dockerignore integration testAanand Prasad2015-08-261-15/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
* | Merge pull request #662 from stevenewey/exec_create_userJoffrey F2015-08-261-0/+34
|\ \ | | | | | | Exec create user
| * \ Merge branch 'master' into exec_create_userStephen Newey2015-08-121-17/+37
| |\ \
| * | | Add test for root user as default exec_create behaviourStephen Newey2015-07-021-0/+17
| | | |
| * | | Add support for user on exec_create.Stephen Newey2015-06-301-0/+17
| | | |
* | | | Test valid no args for log configMazz Mosley2015-08-261-2/+41
| | | | | | | | | | | | | | | | Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
* | | | Remove validation of supported log driversMazz Mosley2015-08-261-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Fix log driver integration testMazz Mosley2015-08-261-20/+15
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Ensure Makefile still run tests properly / tests are run in container as ↵Joffrey F2015-08-251-1/+1
| | | | | | | | | | | | expected
* | | Call Client.create_host_config because the old call is deprecatedBryan Boreham2015-08-251-12/+12
| |/ |/| | | | | Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
* | nit: parenthesis alignmentJoffrey F2015-07-291-6/+12
| |
* | Add netmode (required by docker)John Howard2015-07-281-10/+18
| | | | | | | | Signed-off-by: John Howard <jhoward@microsoft.com>
* | 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>
* | 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)
* | Fix Unix socket adapter bug with double slash in path + regression testfix_647Joffrey F2015-06-301-2/+7
|/
* Fix stop timeout bugfix_649Joffrey F2015-06-241-0/+5
|
* Fixed integration testJoffrey F2015-06-181-1/+1
|
* Added deprecation warning for host config in startJoffrey F2015-05-081-282/+0
|
* Fixes for #586Joffrey F2015-05-061-0/+2
|
* Exec API testsJoffrey F2015-04-271-6/+31
|
* Added tests for log_config paramlogconfig-supportJoffrey F2015-04-241-1/+26
|
* Handle ID truncate on client side in containers list (and changed default ↵client_side_truncJoffrey F2015-04-221-4/+8
| | | | from True to False)
* Added integration testJoffrey F2015-04-221-0/+29
|
* Improved ulimit testsJoffrey F2015-04-221-0/+13
|
* Merge branch 'sam/import-improvements' of ↵Joffrey F2015-04-221-3/+160
|\ | | | | | | | | | | | | | | | | 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).
* | Auto-detect integration testsJoffrey F2015-03-051-0/+22
| |
* | 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
| |/ /
* | | Rename test fix to take into account docker/docker#11003de-i11003Joffrey F2015-02-261-1/+5
|/ /
* | Fix several DOCKER_HOST assumptions in integration_test.pyTianon Gravi2015-02-161-2/+2
| |
* | Fix pep8 error1.0.0Joffrey F2015-02-161-2/+2
| |
* | Merge branch 'add-stats-api-support' of https://github.com/nir0s/docker-py ↵Joffrey F2015-02-121-1/+1
|\ \ | | | | | | | | | into nir0s-add-stats-api-support
| * | added initial support for stats retrievalnir0s2015-02-111-1/+1
| | |
* | | pid_mode integration testspid_modeJoffrey F2015-02-111-0/+31
| | |
* | | read_only parameterread_only_rootfsJoffrey F2015-02-101-0/+27
|/ /
View Lorry Controller Status