Skip to content

Commit 4a8ffcf

Browse files
committed
Merge pull request google#1143 from sjenning/disable-fsstats-devicemapper
skip TestDockerFilesystemStats for devicemapper
2 parents 339bdef + bf9e236 commit 4a8ffcf

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

integration/tests/api/docker_test.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,12 @@ func TestDockerFilesystemStats(t *testing.T) {
295295
fm := framework.New(t)
296296
defer fm.Cleanup()
297297

298+
storageDriver := fm.Docker().StorageDriver()
299+
if storageDriver == framework.DeviceMapper {
300+
// Filesystem stats not supported with devicemapper, yet
301+
return
302+
}
303+
298304
const (
299305
ddUsage = uint64(1 << 3) // 1 KB
300306
sleepDuration = 10 * time.Second
@@ -314,7 +320,6 @@ func TestDockerFilesystemStats(t *testing.T) {
314320
Count: 1,
315321
}
316322
needsBaseUsageCheck := false
317-
storageDriver := fm.Docker().StorageDriver()
318323
switch storageDriver {
319324
case framework.Aufs, framework.Overlay:
320325
needsBaseUsageCheck = true

0 commit comments

Comments
 (0)