From ff1e347fc7db5bbb5459156598b254e6b476a2bb Mon Sep 17 00:00:00 2001 From: Alexei Ledenev Date: Thu, 19 May 2016 16:35:40 +0300 Subject: [PATCH] move test configuration into separate directory --- bats_tests/1_host_configuration.bats | 1 - bats_tests/0_config.example => config/0_config.sh | 0 config/0_config.sh.example | 4 ++++ run_tests.sh | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) rename bats_tests/0_config.example => config/0_config.sh (100%) create mode 100644 config/0_config.sh.example diff --git a/bats_tests/1_host_configuration.bats b/bats_tests/1_host_configuration.bats index 034c9ef..3625695 100644 --- a/bats_tests/1_host_configuration.bats +++ b/bats_tests/1_host_configuration.bats @@ -1,6 +1,5 @@ #!/usr/bin/env bats -load "0_config" load "test_helper/bats-support/load" load "test_helper/bats-assert/load" load "$BATS_TEST_DIRNAME/../helper_lib.sh" diff --git a/bats_tests/0_config.example b/config/0_config.sh similarity index 100% rename from bats_tests/0_config.example rename to config/0_config.sh diff --git a/config/0_config.sh.example b/config/0_config.sh.example new file mode 100644 index 0000000..d95a242 --- /dev/null +++ b/config/0_config.sh.example @@ -0,0 +1,4 @@ +#!/bin/bash + +# trusted users that can control Docker daemon +config_trusted_users=(vagrant docker ubuntu) diff --git a/run_tests.sh b/run_tests.sh index cb8ac8a..cea0227 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -1,6 +1,7 @@ #!/bin/bash . ./generate_tests.sh +. ./config/0_config.sh TEST_RESULTS=$BENCH_ROOT/results