From c809fc552b65ea90ed695d39c24447aa3dbc7891 Mon Sep 17 00:00:00 2001 From: Jessica Frazelle Date: Wed, 4 Feb 2015 13:51:44 -0800 Subject: [PATCH] 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 (github: jfrazelle) --- daemon/graphdriver/graphtest/graphtest.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/daemon/graphdriver/graphtest/graphtest.go b/daemon/graphdriver/graphtest/graphtest.go index af93ea829c..4f14e7aed4 100644 --- a/daemon/graphdriver/graphtest/graphtest.go +++ b/daemon/graphdriver/graphtest/graphtest.go @@ -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)