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)
Upstream-commit: c809fc552b65ea90ed695d39c24447aa3dbc7891
Component: engine
This commit is contained in:
Jessica Frazelle
2015-02-04 13:51:44 -08:00
parent ea7f7015a5
commit e15bc1c2fe

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)