mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-25 13:44:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix assert order being backwards in a few places (#388)

Browse source 
Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>
This commit is contained in:
Chris Marchbanks 2018-09-21 00:23:01 -06:00 committed by Krasi Georgiev
parent e779603633
commit 2db59a71a6
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
db_test.go
View file

@ -110,7 +110,7 @@ func TestDataAvailableOnlyAfterCommit(t *testing.T) {
testutil.Ok(t, err) testutil.Ok(t, err)
seriesSet := query(t, querier, labels.NewEqualMatcher("foo", "bar")) seriesSet := query(t, querier, labels.NewEqualMatcher("foo", "bar"))
testutil.Equals(t, seriesSet, map[string][]sample{}) testutil.Equals(t, map[string][]sample{}, seriesSet)
testutil.Ok(t, querier.Close()) testutil.Ok(t, querier.Close())
err = app.Commit() err = app.Commit()
@ -122,7 +122,7 @@ func TestDataAvailableOnlyAfterCommit(t *testing.T) {
seriesSet = query(t, querier, labels.NewEqualMatcher("foo", "bar")) seriesSet = query(t, querier, labels.NewEqualMatcher("foo", "bar"))
testutil.Equals(t, seriesSet, map[string][]sample{`{foo="bar"}`: {{t: 0, v: 0}}}) testutil.Equals(t, map[string][]sample{`{foo="bar"}`: {{t: 0, v: 0}}}, seriesSet)
} }
func TestDataNotAvailableAfterRollback(t *testing.T) { func TestDataNotAvailableAfterRollback(t *testing.T) {
@ -143,7 +143,7 @@ func TestDataNotAvailableAfterRollback(t *testing.T) {
seriesSet := query(t, querier, labels.NewEqualMatcher("foo", "bar")) seriesSet := query(t, querier, labels.NewEqualMatcher("foo", "bar"))
testutil.Equals(t, seriesSet, map[string][]sample{}) testutil.Equals(t, map[string][]sample{}, seriesSet)
} }
func TestDBAppenderAddRef(t *testing.T) { func TestDBAppenderAddRef(t *testing.T) {
@ -179,7 +179,7 @@ func TestDBAppenderAddRef(t *testing.T) {
testutil.Ok(t, err) testutil.Ok(t, err)
err = app2.AddFast(9999999, 1, 1) err = app2.AddFast(9999999, 1, 1)
testutil.Equals(t, errors.Cause(err), ErrNotFound) testutil.Equals(t, ErrNotFound, errors.Cause(err))
testutil.Ok(t, app2.Commit()) testutil.Ok(t, app2.Commit())
@ -412,7 +412,7 @@ func TestDB_Snapshot(t *testing.T) {
testutil.Ok(t, series.Err()) testutil.Ok(t, series.Err())
} }
testutil.Ok(t, seriesSet.Err()) testutil.Ok(t, seriesSet.Err())
testutil.Equals(t, sum, 1000.0) testutil.Equals(t, 1000.0, sum)
} }
func TestDB_SnapshotWithDelete(t *testing.T) { func TestDB_SnapshotWithDelete(t *testing.T) {
@ -689,7 +689,7 @@ func TestWALFlushedOnDBClose(t *testing.T) {
values, err := q.LabelValues("labelname") values, err := q.LabelValues("labelname")
testutil.Ok(t, err) testutil.Ok(t, err)
testutil.Equals(t, values, []string{"labelvalue"}) testutil.Equals(t, []string{"labelvalue"}, values)
} }
func TestTombstoneClean(t *testing.T) { func TestTombstoneClean(t *testing.T) {

2
head_test.go
View file

@ -858,5 +858,5 @@ func TestHead_LogRollback(t *testing.T) {
series, ok := recs[0].([]RefSeries) series, ok := recs[0].([]RefSeries)
testutil.Assert(t, ok, "expected series record but got %+v", recs[0]) testutil.Assert(t, ok, "expected series record but got %+v", recs[0])
testutil.Equals(t, series, []RefSeries{{Ref: 1, Labels: labels.FromStrings("a", "b")}}) testutil.Equals(t, []RefSeries{{Ref: 1, Labels: labels.FromStrings("a", "b")}}, series)
} }

2
wal_test.go
View file

@ -66,7 +66,7 @@ func TestSegmentWAL_cut(t *testing.T) {
et, flag, b, err := newWALReader(nil, nil).entry(f) et, flag, b, err := newWALReader(nil, nil).entry(f)
testutil.Ok(t, err) testutil.Ok(t, err)
testutil.Equals(t, WALEntrySeries, et) testutil.Equals(t, WALEntrySeries, et)
testutil.Equals(t, flag, byte(walSeriesSimple)) testutil.Equals(t, byte(walSeriesSimple), flag)
testutil.Equals(t, []byte("Hello World!!"), b) testutil.Equals(t, []byte("Hello World!!"), b)
} }
} }