Make the docker check more specific
Docker on a mac might be available, but may not be runnng. The way the original test was written is linux-specific anyway, so just hoist the check into the DOCKER declaration
Peter Rabbitson committed
Dec 14, 2019 at 15:12 UTC
153e52929ac37cd688ca9bab26fc9e6e429071db
3 files changed
+2
-6
test/sharness/lib/test-lib.sh
+1
-1
@@ -52,7 +52,7 @@ TEST_OS="$(uname -s | tr '[a-z]' '[A-Z]')"
52
# grab + output options
53
test "$TEST_NO_FUSE" != 1 && test_set_prereq FUSE
54
test "$TEST_EXPENSIVE" = 1 && test_set_prereq EXPENSIVE
55
-test "$TEST_NO_DOCKER" != 1 && type docker >/dev/null 2>&1 && test_set_prereq DOCKER
55
+test "$TEST_NO_DOCKER" != 1 && type docker >/dev/null 2>&1 && groups | egrep "\bdocker\b" && test_set_prereq DOCKER
56
test "$TEST_NO_PLUGIN" != 1 && test "$TEST_OS" = "LINUX" && test_set_prereq PLUGIN
57
58
# this may not be available, skip a few dependent tests
test/sharness/t0300-docker-image.sh
-4
@@ -23,10 +23,6 @@ test_expect_success "'docker --version' output looks good" '
23
egrep "^Docker version" actual
24
'
25
26
-test_expect_success "current user is in the 'docker' group" '
27
- groups | egrep "\bdocker\b"
28
-'
29
-
26
TEST_TRASH_DIR=$(pwd)
27
TEST_SCRIPTS_DIR=$(dirname "$TEST_TRASH_DIR")
28
TEST_TESTS_DIR=$(dirname "$TEST_SCRIPTS_DIR")
test/sharness/t0301-docker-migrate.sh
+1
-1
@@ -10,7 +10,7 @@ test_description="Test docker image migration"
10
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'
13
+ skip_all='skipping '$test_description', docker not available'
14
15
test_done
16
fi