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

Merge pull request #10566 from jfrazelle/fix-overlay-unit-tests-for-btrfs

Fix for running unit tests on a 3.18 kernel with btrfs.
This commit is contained in:
Alexander Morozov 2015-02-04 15:41:06 -08:00
commit fd1bdf2120

View file

@ -5,7 +5,6 @@ import (
"io/ioutil"
"os"
"path"
"strings"
"syscall"
"testing"
@ -74,7 +73,8 @@ func newDriver(t *testing.T, name string) *Driver {
d, err := graphdriver.GetDriver(name, root, 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.Fatal(err)