defines the order of the returned recent stats

This commit is contained in:
Nan Deng 2014-06-17 21:07:40 -07:00
parent 20b13c4cfc
commit 9c54221a54

View File

@ -242,15 +242,14 @@ func StorageDriverTestRetrievePartialRecentStats(driver storage.StorageDriver, t
t.Fatalf("returned %v stats, not 10.", len(recentStats)) t.Fatalf("returned %v stats, not 10.", len(recentStats))
} }
for _, r := range recentStats { traceIdx := len(trace) - 1
found := false // Latest stats come first
for _, s := range trace[len(trace)-10:] { for i := 0; i < 10; i++ {
if reflect.DeepEqual(s, r) { r := recentStats[i]
found = true s := trace[traceIdx]
} traceIdx--
} if !reflect.DeepEqual(s, r) {
if !found { 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)
t.Errorf("returned unexpected stats: %+v; %v", r, r.Memory.Usage)
} }
} }
} }
@ -281,15 +280,12 @@ func StorageDriverTestRetrieveAllRecentStats(driver storage.StorageDriver, t *te
t.Fatal(err) t.Fatal(err)
} }
for _, r := range recentStats { traceIdx := len(trace) - 1
found := false for i, r := range recentStats {
for _, s := range trace { s := trace[traceIdx]
if reflect.DeepEqual(s, r) { traceIdx--
found = true if !reflect.DeepEqual(s, r) {
} 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("returned unexpected stats: %+v; %v", r, r.Memory.Usage)
} }
} }
} }