remove constraints

This commit is contained in:
Nan Deng 2014-06-18 11:17:35 -07:00
parent 7258101720
commit 21cf8472a0

View File

@ -52,7 +52,6 @@ func buildTrace(cpu, mem []uint64, duration time.Duration) []*info.ContainerStat
return ret return ret
} }
// The underlying driver must be able to hold more than 10 samples.
func StorageDriverTestSampleCpuUsage(driver storage.StorageDriver, t *testing.T) { func StorageDriverTestSampleCpuUsage(driver storage.StorageDriver, t *testing.T) {
defer driver.Close() defer driver.Close()
N := 10 N := 10
@ -170,7 +169,6 @@ func StorageDriverTestPercentilesWithoutSample(driver storage.StorageDriver, t *
} }
} }
// The driver must be able to hold more than 100 samples
func StorageDriverTestPercentiles(driver storage.StorageDriver, t *testing.T) { func StorageDriverTestPercentiles(driver storage.StorageDriver, t *testing.T) {
defer driver.Close() defer driver.Close()
N := 100 N := 100
@ -198,21 +196,25 @@ func StorageDriverTestPercentiles(driver storage.StorageDriver, t *testing.T) {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
for _, s := range percentiles.CpuUsagePercentiles { for _, x := range percentiles.CpuUsagePercentiles {
// The value is out of the range of tolerance.. for _, y := range percentiles.CpuUsagePercentiles {
if s.Value > uint64(s.Percentage+1) || s.Value < uint64(s.Percentage-1) { // lower percentage, smaller value
t.Errorf("%v percentile data should be %v, but got %v", s.Percentage, s.Percentage, s.Value) if x.Percentage < y.Percentage && x.Value > y.Value {
t.Errorf("%v percent is %v; while %v percent is %v",
x.Percentage, x.Value, y.Percentage, y.Value)
}
} }
} }
for _, s := range percentiles.MemoryUsagePercentiles { for _, x := range percentiles.MemoryUsagePercentiles {
// The value is out of the range of tolerance.. for _, y := range percentiles.MemoryUsagePercentiles {
if s.Value > uint64(s.Percentage+1) || s.Value < uint64(s.Percentage-1) { if x.Percentage < y.Percentage && x.Value > y.Value {
t.Errorf("%v percentile data should be %v, but got %v", s.Percentage, s.Percentage, s.Value) t.Errorf("%v percent is %v; while %v percent is %v",
x.Percentage, x.Value, y.Percentage, y.Value)
}
} }
} }
} }
// The driver must be albe to hold more than 10 stats
func StorageDriverTestRetrievePartialRecentStats(driver storage.StorageDriver, t *testing.T) { func StorageDriverTestRetrievePartialRecentStats(driver storage.StorageDriver, t *testing.T) {
defer driver.Close() defer driver.Close()
N := 100 N := 100
@ -238,18 +240,21 @@ func StorageDriverTestRetrievePartialRecentStats(driver storage.StorageDriver, t
t.Fatal(err) t.Fatal(err)
} }
if len(recentStats) != 10 { if len(recentStats) > 10 {
t.Fatalf("returned %v stats, not 10.", len(recentStats)) t.Fatalf("returned %v stats, not 10.", len(recentStats))
} }
traceIdx := len(trace) - 1 actualRecentStats := trace[len(trace)-len(recentStats):]
// Latest stats come first
for i := 0; i < 10; i++ { for _, r := range recentStats {
r := recentStats[i] found := false
s := trace[traceIdx] for _, s := range actualRecentStats {
traceIdx-- if reflect.DeepEqual(s, r) {
if !reflect.DeepEqual(s, r) { found = true
t.Errorf("The %vth item should be %+v with memory usage %v; got item %+v with memory usage %v", i, s, s.Memory.Usage, r, r.Memory.Usage) }
}
if !found {
t.Errorf("unexpected stats %+v with memory usage %v", r, r.Memory.Usage)
} }
} }
} }
@ -278,13 +283,21 @@ func StorageDriverTestRetrieveAllRecentStats(driver storage.StorageDriver, t *te
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
if len(recentStats) > N {
t.Fatalf("returned %v stats, not 100.", len(recentStats))
}
traceIdx := len(trace) - 1 actualRecentStats := trace[len(trace)-len(recentStats):]
for i, r := range recentStats {
s := trace[traceIdx] for _, r := range recentStats {
traceIdx-- found := false
if !reflect.DeepEqual(s, r) { for _, s := range actualRecentStats {
t.Errorf("The %vth item should be %+v with memory usage %v; got item %+v with memory usage %v", i, s, s.Memory.Usage, r, r.Memory.Usage) if reflect.DeepEqual(s, r) {
found = true
}
}
if !found {
t.Errorf("unexpected stats %+v with memory usage %v", r, r.Memory.Usage)
} }
} }
} }