Commit Graph

15 Commits

Author SHA1 Message Date
Joffrey F 93a296fb04 Reorganize test directories
More clearly separate unit and integration tests
Allow splitting into multiple files
Cleaner

Signed-off-by: Joffrey F <joffrey@docker.com>
2015-10-21 16:02:09 -07:00
Stephen Moore 7f3692ceed Fix attach method over SSL connections
Signed-off-by: Stephen Moore <stephen@delfick.com>
2015-10-14 17:29:31 -07:00
Aanand Prasad b2c4228bb8 Move pytest default options into pytest.ini
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-09-25 20:16:57 +02:00
Joffrey F 8c270dfdf0 Merge pull request #780 from docker/contributing
[WIP] Contributing guidelines
2015-09-22 14:06:20 -07:00
Aanand Prasad eec0465832 Make volume binds tests work on any host
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>
2015-09-22 11:34:49 -07:00
Joffrey F c4153c9c87 Add flake8 make task
Fix 'make test' task to run a complete series of tests

Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-21 15:35:28 -07:00
Joffrey F 1fb2db4951 Make integration tests more CI-friendly.
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-09 17:06:34 -07:00
Joffrey F fa3082b6cd Update integration-dind task 2015-09-09 14:49:58 -07:00
Joffrey F abaf346b49 Make running integration tests with dind possible 2015-09-09 14:49:36 -07:00
Aanand Prasad 6c0f7187a8 Integration test improvements
- 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>
2015-08-31 12:06:41 -07:00
Joffrey F b5f1e64e8f Ensure Makefile still run tests properly / tests are run in container as expected 2015-08-25 16:58:01 -07:00
Aanand Prasad 6e27c2a3d0 Run tests with pytest
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-25 16:34:33 +01:00
Joffrey F 5f0f085fc7 Updated Makefile to help with release testing 2015-07-22 11:34:36 -07:00
Joffrey F 070cbece0a Fixes for #586 2015-05-06 17:53:53 -07:00
Ben Firshman 4d0416ac91 Add Makefile for running tests in Docker
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>
2014-10-16 17:55:22 +01:00