Commit Graph

7 Commits

Author SHA1 Message Date
Jason Wilder 8ed5ab38b8 Update to docker-gen 0.7.3 2016-06-13 00:24:21 -06:00
Jason Wilder d40d1d4052 Update to docker-gen 0.7.1 2016-05-04 14:51:30 -06:00
Baptiste Donaux 6928d62e1e Upgrade Docker dependency from 1.9 to 1.10 2016-03-24 14:40:50 +01:00
Pit Kleyersburg 86aea653c8 Update to docker-gen 0.7.0
Since [1] some timings seem to have changed. This caused the unit tests
to fail intermittently, from my testings especially on Ubuntu systems
(much less often on e.g. Arch).

This commit adds the `dockergen_wait_for_event` helper-function to try
and wait for the configuration to be generated by docker-gen before
continuing on with the actual tests themselves.

Additionally, at the end of every test file, all containers spun up by
the bats-tests will be stopped. This required adding the `bats-type`
label to every container started during the bats-tests.

The stopping of the containers reduces the amount of events docker-gen
has to process, thus resulting in lower wait times for the generation to
happen.

[1]: 50435652b1
2016-03-23 17:45:34 +01:00
Thomas LEVEIL c11af183d8 CircleCI: make tests run on Docker 1.9.1
See CircleCI announcement https://discuss.circleci.com/t/docker-1-9-1-is-available/1009
2015-12-14 09:25:21 +01:00
Thomas LEVEIL 66d401c075 makefile: update docker images before running tests 2015-10-14 19:42:59 +00:00
Jason Wilder e09550febb Add Makefile
Make it easier to run tests.
2015-10-14 10:29:22 -06:00