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

Fix for running unit tests on a 3.18 kernel with btrfs.
Upstream-commit: fd1bdf21206f41de95ebc5310ac00499829a4943
Component: engine

components/engine/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)