1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Fix for running unit tests on a 3.18 kernel with btrfs.

Was failing on overlay before and comparing the wrong error.

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
This commit is contained in:
Jessica Frazelle 2015-02-04 13:51:44 -08:00
parent 5a5726c5e4
commit c809fc552b

View file

@ -5,7 +5,6 @@ import (
"io/ioutil" "io/ioutil"
"os" "os"
"path" "path"
"strings"
"syscall" "syscall"
"testing" "testing"
@ -74,7 +73,8 @@ func newDriver(t *testing.T, name string) *Driver {
d, err := graphdriver.GetDriver(name, root, nil) d, err := graphdriver.GetDriver(name, root, nil)
if err != nil { if err != nil {
if err == graphdriver.ErrNotSupported || err == graphdriver.ErrPrerequisites || strings.Contains(err.Error(), "'overlay' is not supported over") { t.Logf("graphdriver: %s\n", err.Error())
if err == graphdriver.ErrNotSupported || err == graphdriver.ErrPrerequisites || err == graphdriver.ErrIncompatibleFS {
t.Skipf("Driver %s not supported", name) t.Skipf("Driver %s not supported", name)
} }
t.Fatal(err) t.Fatal(err)