Merge pull request #105 from monnand/re-enable-influxdb

re-enable unit tests for influxdb
This commit is contained in:
Vish Kannan 2014-08-06 16:46:21 -07:00
commit 6c2694a53b
2 changed files with 1 additions and 13 deletions

View File

@ -95,55 +95,43 @@ func runStorageTest(f func(storage.StorageDriver, *testing.T), t *testing.T) {
f(driver, t) f(driver, t)
} }
// TODO(vmarmol): Don't skip these tests when Travis is fixed.
func TestSampleCpuUsage(t *testing.T) { func TestSampleCpuUsage(t *testing.T) {
t.SkipNow()
runStorageTest(test.StorageDriverTestSampleCpuUsage, t) runStorageTest(test.StorageDriverTestSampleCpuUsage, t)
} }
func TestRetrievePartialRecentStats(t *testing.T) { func TestRetrievePartialRecentStats(t *testing.T) {
t.SkipNow()
runStorageTest(test.StorageDriverTestRetrievePartialRecentStats, t) runStorageTest(test.StorageDriverTestRetrievePartialRecentStats, t)
} }
func TestSamplesWithoutSample(t *testing.T) { func TestSamplesWithoutSample(t *testing.T) {
t.SkipNow()
runStorageTest(test.StorageDriverTestSamplesWithoutSample, t) runStorageTest(test.StorageDriverTestSamplesWithoutSample, t)
} }
func TestRetrieveAllRecentStats(t *testing.T) { func TestRetrieveAllRecentStats(t *testing.T) {
t.SkipNow()
runStorageTest(test.StorageDriverTestRetrieveAllRecentStats, t) runStorageTest(test.StorageDriverTestRetrieveAllRecentStats, t)
} }
func TestNoRecentStats(t *testing.T) { func TestNoRecentStats(t *testing.T) {
t.SkipNow()
runStorageTest(test.StorageDriverTestNoRecentStats, t) runStorageTest(test.StorageDriverTestNoRecentStats, t)
} }
func TestNoSamples(t *testing.T) { func TestNoSamples(t *testing.T) {
t.SkipNow()
runStorageTest(test.StorageDriverTestNoSamples, t) runStorageTest(test.StorageDriverTestNoSamples, t)
} }
func TestPercentiles(t *testing.T) { func TestPercentiles(t *testing.T) {
t.SkipNow()
runStorageTest(test.StorageDriverTestPercentiles, t) runStorageTest(test.StorageDriverTestPercentiles, t)
} }
func TestMaxMemoryUsage(t *testing.T) { func TestMaxMemoryUsage(t *testing.T) {
t.SkipNow()
runStorageTest(test.StorageDriverTestMaxMemoryUsage, t) runStorageTest(test.StorageDriverTestMaxMemoryUsage, t)
} }
func TestPercentilesWithoutSample(t *testing.T) { func TestPercentilesWithoutSample(t *testing.T) {
t.SkipNow()
runStorageTest(test.StorageDriverTestPercentilesWithoutSample, t) runStorageTest(test.StorageDriverTestPercentilesWithoutSample, t)
} }
func TestPercentilesWithoutStats(t *testing.T) { func TestPercentilesWithoutStats(t *testing.T) {
t.SkipNow()
runStorageTest(test.StorageDriverTestPercentilesWithoutStats, t) runStorageTest(test.StorageDriverTestPercentilesWithoutStats, t)
} }

View File

@ -396,7 +396,7 @@ func StorageDriverTestRetrievePartialRecentStats(driver storage.StorageDriver, t
for i, s := range actualRecentStats { for i, s := range actualRecentStats {
r := recentStats[i] r := recentStats[i]
if !statsEq(s, r) { if !statsEq(s, r) {
t.Errorf("unexpected stats %+v with memory usage %v", r, r.Memory.Usage) t.Errorf("unexpected stats %+v with memory usage %v; should be %+v", r, r.Memory.Usage, s)
} }
} }
} }