prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
skip TestDockerFilesystemStats for devicemapper
This commit is contained in:
Vish Kannan 2016-03-01 11:22:10 -08:00
commit 4a8ffcfc7e
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
integration/tests/api/docker_test.go
View File

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