Merge pull request #1501 from dashpole/remove_flaky_test

removed flaky test
This commit is contained in:
Tim St. Clair 2016-10-14 13:33:10 -07:00 committed by GitHub
commit cae5bfaee6

View File

@ -106,23 +106,6 @@ func TestDirDiskUsage(t *testing.T) {
as.True(expectedSize <= size, "expected dir size to be at-least %d; got size: %d", expectedSize, size)
}
// Make sure that the timeout is actually being triggered (found this bug in PR#1489)
func TestDirDiskUsageTimeout(t *testing.T) {
as := assert.New(t)
fsInfo, err := NewFsInfo(Context{})
as.NoError(err)
dir, err := ioutil.TempDir(os.TempDir(), "")
as.NoError(err)
defer os.RemoveAll(dir)
dataSize := 1024 * 10000 //10000 KB. It is large to make sure it triggers the timeout
b := make([]byte, dataSize)
f, err := ioutil.TempFile(dir, "")
as.NoError(err)
as.NoError(ioutil.WriteFile(f.Name(), b, 0700))
_, err = fsInfo.GetDirDiskUsage(dir, time.Nanosecond)
as.Error(err)
}
func TestDirInodeUsage(t *testing.T) {
as := assert.New(t)
fsInfo, err := NewFsInfo(Context{})
@ -141,23 +124,6 @@ func TestDirInodeUsage(t *testing.T) {
as.True(uint64(numFiles+1) == inodes, "expected inodes in dir to be %d; got inodes: %d", numFiles+1, inodes)
}
//make sure that the timeout is actually being triggered
func TestDirInodeUsageTimeout(t *testing.T) {
as := assert.New(t)
fsInfo, err := NewFsInfo(Context{})
as.NoError(err)
dir, err := ioutil.TempDir(os.TempDir(), "")
as.NoError(err)
defer os.RemoveAll(dir)
numFiles := 100000 //make sure we actually trigger the timeout
for i := 0; i < numFiles; i++ {
_, err := ioutil.TempFile(dir, "")
require.NoError(t, err)
}
_, err = fsInfo.GetDirInodeUsage(dir, time.Nanosecond)
as.Error(err)
}
var dmStatusTests = []struct {
dmStatus string
used uint64