Add and use a DOCKER prereq
License: MIT Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Christian Couder committed
Dec 13, 2015 at 14:56 UTC
1fbbd1de155f54043ec68d9e333030ba6622dd5e
2 files changed
+7
-3
test/sharness/lib/test-lib.sh
+1
@@ -41,6 +41,7 @@ SHARNESS_LIB="lib/sharness/sharness.sh"
41
# grab + output options
42
test "$TEST_NO_FUSE" != 1 && test_set_prereq FUSE
43
test "$TEST_EXPENSIVE" = 1 && test_set_prereq EXPENSIVE
44
+type docker && test_set_prereq DOCKER
45
46
if test "$TEST_VERBOSE" = 1; then
47
echo '# TEST_VERBOSE='"$TEST_VERBOSE"
test/sharness/t0300-docker-image.sh
+6
-3
@@ -8,9 +8,12 @@ test_description="Test docker image"
8
9
. lib/test-lib.sh
10
11
-test_expect_success "docker is installed" '
12
- type docker
13
-'
11
+# if in travis CI on OSX, docker is not available
12
+if ! test_have_prereq DOCKER; then
13
+ skip_all='skipping docker tests, docker not available'
14
+
15
+ test_done
16
+fi
17
18
test_expect_success "'docker --version' works" '
19
docker --version >actual