summaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* make,integration-dind: try to remove dpy-dindTomas Tomecek2015-12-021-0/+1
| | | | | | | b/c if test fails, dpy-dind is left running and integration-dind target will refuse to start and you need to manually force-remove the container Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
* Fix integration-dind-ssl make task852-independent-integrationJoffrey F2015-11-181-2/+2
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Add build integration test checking stderr shows up in streamJoffrey F2015-11-111-0/+2
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Bump default API version to 1.21bump_api_version_121Joffrey F2015-11-041-2/+2
| | | | | | | Update Makefile to run tests against dind 1.9.0 Update network tests to account for latest API changes Signed-off-by: Joffrey F <joffrey@docker.com>
* Reorganize test directoriesreorganize_testsJoffrey F2015-10-211-6/+6
| | | | | | | | More clearly separate unit and integration tests Allow splitting into multiple files Cleaner Signed-off-by: Joffrey F <joffrey@docker.com>
* Fix attach method over SSL connectionsStephen Moore2015-10-141-5/+15
| | | | Signed-off-by: Stephen Moore <stephen@delfick.com>
* Move pytest default options into pytest.iniAanand Prasad2015-09-251-4/+4
| | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* Merge pull request #780 from docker/contributingJoffrey F2015-09-221-1/+4
|\ | | | | [WIP] Contributing guidelines
| * Add flake8 make taskJoffrey F2015-09-211-1/+4
| | | | | | | | | | | | Fix 'make test' task to run a complete series of tests Signed-off-by: Joffrey F <joffrey@docker.com>
* | Make volume binds tests work on any hostAanand Prasad2015-09-221-7/+5
|/ | | | | | | | | | | Instead of creating the test directory directly on the host, create it by starting a container with the directory bind-mounted, so that it doesn't matter whether the daemon is local, in a VM or remote. This removes the need to make /tmp a volume in the test container, and to share it with the dind container. Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* Make integration tests more CI-friendly.Joffrey F2015-09-091-1/+0
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Update integration-dind task756-containerized-integrationJoffrey F2015-09-091-2/+8
|
* Make running integration tests with dind possibleJoffrey F2015-09-091-0/+4
|
* Integration test improvementsAanand Prasad2015-08-311-2/+2
| | | | | | | | | | | - 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>
* Ensure Makefile still run tests properly / tests are run in container as ↵Joffrey F2015-08-251-4/+4
| | | | expected
* Run tests with pytestAanand Prasad2015-08-251-2/+2
| | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* Updated Makefile to help with release testing1.3.1-releaseJoffrey F2015-07-221-2/+11
|
* Fixes for #586Joffrey F2015-05-061-2/+3
|
* Add Makefile for running tests in DockerBen Firshman2014-10-161-0/+15
It assumes you've got Docker running on /var/run/docker.sock, but that should be the case on both Linux and in Boot2Docker. Signed-off-by: Ben Firshman <ben@firshman.co.uk>
View Lorry Controller Status