Merge pull request #1143 from sjenning/disable-fsstats-devicemapper

skip TestDockerFilesystemStats for devicemapper
This commit is contained in:
Vish Kannan 2016-03-01 11:22:10 -08:00
commit 4a8ffcfc7e

View File

@ -295,6 +295,12 @@ func TestDockerFilesystemStats(t *testing.T) {
fm := framework.New(t)
defer fm.Cleanup()
storageDriver := fm.Docker().StorageDriver()
if storageDriver == framework.DeviceMapper {
// Filesystem stats not supported with devicemapper, yet
return
}
const (
ddUsage = uint64(1 << 3) // 1 KB
sleepDuration = 10 * time.Second
@ -314,7 +320,6 @@ func TestDockerFilesystemStats(t *testing.T) {
Count: 1,
}
needsBaseUsageCheck := false
storageDriver := fm.Docker().StorageDriver()
switch storageDriver {
case framework.Aufs, framework.Overlay:
needsBaseUsageCheck = true