From d9e6ca832170cdb5f6c56181cb9e28ed6f2b0330 Mon Sep 17 00:00:00 2001 From: Thomas VIAL Date: Sun, 1 Jan 2017 19:17:21 +0100 Subject: [PATCH] Increased build time, and dependencies --- .dockerignore | 3 ++- .gitignore | 5 +++-- .travis.yml | 2 +- test/bats | 1 + test/test_helper/bats-assert | 1 + test/test_helper/bats-support | 1 + 6 files changed, 9 insertions(+), 4 deletions(-) create mode 160000 test/bats create mode 160000 test/test_helper/bats-assert create mode 160000 test/test_helper/bats-support diff --git a/.dockerignore b/.dockerignore index 781176e0..a0cca7c0 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1 +1,2 @@ -test/onedir \ No newline at end of file +test/ +elk/ \ No newline at end of file diff --git a/.gitignore b/.gitignore index 14ce13d3..5260ecc5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,9 @@ .DS_Store docker-compose.yml .idea -test/bats/ -test/test_helper/ +test/bats/* +test/test_helper/bats-assert/* +test/test_helper/bats-support/* test/config/empty/ test/config/without-accounts/ test/config/without-virtual/ diff --git a/.travis.yml b/.travis.yml index f66fe5cf..81d31bfe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ sudo: required services: - docker install: -- travis_wait make build-no-cache +- travis_wait 30 make build-no-cache script: - make generate-accounts run fixtures tests after_script: diff --git a/test/bats b/test/bats new file mode 160000 index 00000000..03608115 --- /dev/null +++ b/test/bats @@ -0,0 +1 @@ +Subproject commit 03608115df2071fff4eaaff1605768c275e5f81f diff --git a/test/test_helper/bats-assert b/test/test_helper/bats-assert new file mode 160000 index 00000000..9f88b420 --- /dev/null +++ b/test/test_helper/bats-assert @@ -0,0 +1 @@ +Subproject commit 9f88b4207da750093baabc4e3f41bf68f0dd3630 diff --git a/test/test_helper/bats-support b/test/test_helper/bats-support new file mode 160000 index 00000000..004e7076 --- /dev/null +++ b/test/test_helper/bats-support @@ -0,0 +1 @@ +Subproject commit 004e707638eedd62e0481e8cdc9223ad471f12ee