From 9c54221a54384b0cc73bb63734a164d8567c1721 Mon Sep 17 00:00:00 2001 From: Nan Deng Date: Tue, 17 Jun 2014 21:07:40 -0700 Subject: [PATCH] defines the order of the returned recent stats --- storage/test/storagetests.go | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/storage/test/storagetests.go b/storage/test/storagetests.go index 27505f57..1b23fd24 100644 --- a/storage/test/storagetests.go +++ b/storage/test/storagetests.go @@ -242,15 +242,14 @@ func StorageDriverTestRetrievePartialRecentStats(driver storage.StorageDriver, t t.Fatalf("returned %v stats, not 10.", len(recentStats)) } - for _, r := range recentStats { - found := false - for _, s := range trace[len(trace)-10:] { - if reflect.DeepEqual(s, r) { - found = true - } - } - if !found { - t.Errorf("returned unexpected stats: %+v; %v", r, r.Memory.Usage) + traceIdx := len(trace) - 1 + // Latest stats come first + for i := 0; i < 10; i++ { + r := recentStats[i] + s := trace[traceIdx] + traceIdx-- + 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) } } } @@ -281,15 +280,12 @@ func StorageDriverTestRetrieveAllRecentStats(driver storage.StorageDriver, t *te t.Fatal(err) } - for _, r := range recentStats { - found := false - for _, s := range trace { - if reflect.DeepEqual(s, r) { - found = true - } - } - if !found { - t.Errorf("returned unexpected stats: %+v; %v", r, r.Memory.Usage) + traceIdx := len(trace) - 1 + for i, r := range recentStats { + s := trace[traceIdx] + traceIdx-- + 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) } } }