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

Fix order of testutil.Equals (#6695)

Browse source 
Equals takes the expected value as first parameter, and the actual value
as second parameter.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
This commit is contained in:
Julien Pivotto 2020-01-27 13:21:59 +01:00 committed by Brian Brazil
parent 5f27ac3583
commit cf42888e4d
7 changed files with 46 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
discovery/openstack/hypervisor_test.go
View file

@ -65,21 +65,29 @@ func TestOpenstackSDHypervisorRefresh(t *testing.T) {
testutil.Ok(t, err) testutil.Ok(t, err)
testutil.Assert(t, tg != nil, "") testutil.Assert(t, tg != nil, "")
testutil.Assert(t, tg.Targets != nil, "") testutil.Assert(t, tg.Targets != nil, "")
testutil.Assert(t, len(tg.Targets) == 2, "") testutil.Equals(t, 2, len(tg.Targets))
testutil.Equals(t, tg.Targets[0]["__address__"], model.LabelValue("172.16.70.14:0")) for l, v := range map[string]string{
testutil.Equals(t, tg.Targets[0]["__meta_openstack_hypervisor_hostname"], model.LabelValue("nc14.cloud.com")) "__address__": "172.16.70.14:0",
testutil.Equals(t, tg.Targets[0]["__meta_openstack_hypervisor_type"], model.LabelValue("QEMU")) "__meta_openstack_hypervisor_hostname": "nc14.cloud.com",
testutil.Equals(t, tg.Targets[0]["__meta_openstack_hypervisor_host_ip"], model.LabelValue("172.16.70.14")) "__meta_openstack_hypervisor_type": "QEMU",
testutil.Equals(t, tg.Targets[0]["__meta_openstack_hypervisor_state"], model.LabelValue("up")) "__meta_openstack_hypervisor_host_ip": "172.16.70.14",
testutil.Equals(t, tg.Targets[0]["__meta_openstack_hypervisor_status"], model.LabelValue("enabled")) "__meta_openstack_hypervisor_state": "up",
"__meta_openstack_hypervisor_status": "enabled",
} {
testutil.Equals(t, model.LabelValue(v), tg.Targets[0][model.LabelName(l)])
}
testutil.Equals(t, tg.Targets[1]["__address__"], model.LabelValue("172.16.70.13:0")) for l, v := range map[string]string{
testutil.Equals(t, tg.Targets[1]["__meta_openstack_hypervisor_hostname"], model.LabelValue("cc13.cloud.com")) "__address__": "172.16.70.13:0",
testutil.Equals(t, tg.Targets[1]["__meta_openstack_hypervisor_type"], model.LabelValue("QEMU")) "__meta_openstack_hypervisor_hostname": "cc13.cloud.com",
testutil.Equals(t, tg.Targets[1]["__meta_openstack_hypervisor_host_ip"], model.LabelValue("172.16.70.13")) "__meta_openstack_hypervisor_type": "QEMU",
testutil.Equals(t, tg.Targets[1]["__meta_openstack_hypervisor_state"], model.LabelValue("up")) "__meta_openstack_hypervisor_host_ip": "172.16.70.13",
testutil.Equals(t, tg.Targets[1]["__meta_openstack_hypervisor_status"], model.LabelValue("enabled")) "__meta_openstack_hypervisor_state": "up",
"__meta_openstack_hypervisor_status": "enabled",
} {
testutil.Equals(t, model.LabelValue(v), tg.Targets[1][model.LabelName(l)])
}
mock.TearDownSuite() mock.TearDownSuite()
} }

18
promql/engine_test.go
View file

@ -149,7 +149,7 @@ func TestQueryCancel(t *testing.T) {
<-processing <-processing
testutil.NotOk(t, res.Err, "expected cancellation error for query1 but got none") testutil.NotOk(t, res.Err, "expected cancellation error for query1 but got none")
testutil.Equals(t, res.Err, errQueryCanceled) testutil.Equals(t, errQueryCanceled, res.Err)
// Canceling a query before starting it must have no effect. // Canceling a query before starting it must have no effect.
query2 := engine.newTestQuery(func(ctx context.Context) error { query2 := engine.newTestQuery(func(ctx context.Context) error {
@ -203,14 +203,14 @@ func TestQueryError(t *testing.T) {
res := vectorQuery.Exec(ctx) res := vectorQuery.Exec(ctx)
testutil.NotOk(t, res.Err, "expected error on failed select but got none") testutil.NotOk(t, res.Err, "expected error on failed select but got none")
testutil.Equals(t, res.Err, errStorage) testutil.Equals(t, errStorage, res.Err)
matrixQuery, err := engine.NewInstantQuery(queryable, "foo[1m]", time.Unix(1, 0)) matrixQuery, err := engine.NewInstantQuery(queryable, "foo[1m]", time.Unix(1, 0))
testutil.Ok(t, err) testutil.Ok(t, err)
res = matrixQuery.Exec(ctx) res = matrixQuery.Exec(ctx)
testutil.NotOk(t, res.Err, "expected error on failed select but got none") testutil.NotOk(t, res.Err, "expected error on failed select but got none")
testutil.Equals(t, res.Err, errStorage) testutil.Equals(t, errStorage, res.Err)
} }
// paramCheckerQuerier implements storage.Querier which checks the start and end times // paramCheckerQuerier implements storage.Querier which checks the start and end times
@ -486,7 +486,7 @@ func TestEngineShutdown(t *testing.T) {
<-processing <-processing
testutil.NotOk(t, res.Err, "expected error on shutdown during query but got none") testutil.NotOk(t, res.Err, "expected error on shutdown during query but got none")
testutil.Equals(t, res.Err, errQueryCanceled) testutil.Equals(t, errQueryCanceled, res.Err)
query2 := engine.newTestQuery(func(context.Context) error { query2 := engine.newTestQuery(func(context.Context) error {
t.Fatalf("reached query execution unexpectedly") t.Fatalf("reached query execution unexpectedly")
@ -599,7 +599,7 @@ load 10s
} }
testutil.Ok(t, res.Err) testutil.Ok(t, res.Err)
testutil.Equals(t, res.Value, c.Result) testutil.Equals(t, c.Result, res.Value)
} }
} }
@ -816,8 +816,8 @@ load 10s
testutil.Ok(t, err) testutil.Ok(t, err)
res := qry.Exec(test.Context()) res := qry.Exec(test.Context())
testutil.Equals(t, res.Err, c.Result.Err) testutil.Equals(t, c.Result.Err, res.Err)
testutil.Equals(t, res.Value, c.Result.Value) testutil.Equals(t, c.Result.Value, res.Value)
} }
} }
@ -1100,8 +1100,8 @@ func TestSubquerySelector(t *testing.T) {
testutil.Ok(t, err) testutil.Ok(t, err)
res := qry.Exec(test.Context()) res := qry.Exec(test.Context())
testutil.Equals(t, res.Err, c.Result.Err) testutil.Equals(t, c.Result.Err, res.Err)
testutil.Equals(t, res.Value, c.Result.Value) testutil.Equals(t, c.Result.Value, res.Value)
} }
} }
} }

2
promql/lex_test.go
View file

@ -730,7 +730,7 @@ func TestLexer(t *testing.T) {
testutil.Equals(t, lastItem, eofItem, "%d: input %q", i, test.input) testutil.Equals(t, lastItem, eofItem, "%d: input %q", i, test.input)
out = out[:len(out)-1] out = out[:len(out)-1]
testutil.Equals(t, out, test.expected, "%d: input %q", i, test.input) testutil.Equals(t, test.expected, out, "%d: input %q", i, test.input)
} }
}) })
} }

6
promql/parse_test.go
View file

@ -2488,7 +2488,7 @@ func TestParseExpressions(t *testing.T) {
if !test.fail { if !test.fail {
testutil.Ok(t, err) testutil.Ok(t, err)
testutil.Equals(t, expr, test.expected, "error on input '%s'", test.input) testutil.Equals(t, test.expected, expr, "error on input '%s'", test.input)
} else { } else {
testutil.NotOk(t, err) testutil.NotOk(t, err)
testutil.Assert(t, strings.Contains(err.Error(), test.errMsg), "unexpected error on input '%s', expected '%s', got '%s'", test.input, test.errMsg, err.Error()) testutil.Assert(t, strings.Contains(err.Error(), test.errMsg), "unexpected error on input '%s', expected '%s', got '%s'", test.input, test.errMsg, err.Error())
@ -2635,7 +2635,7 @@ func TestRecoverParserRuntime(t *testing.T) {
var err error var err error
defer func() { defer func() {
testutil.Equals(t, err, errUnexpected) testutil.Equals(t, errUnexpected, err)
}() }()
defer p.recover(&err) defer p.recover(&err)
// Cause a runtime panic. // Cause a runtime panic.
@ -2651,7 +2651,7 @@ func TestRecoverParserError(t *testing.T) {
e := errors.New("custom error") e := errors.New("custom error")
defer func() { defer func() {
testutil.Equals(t, err.Error(), e.Error()) testutil.Equals(t, e.Error(), err.Error())
}() }()
defer p.recover(&err) defer p.recover(&err)

8
rules/alerting_test.go
View file

@ -138,7 +138,7 @@ func TestAlertingRuleLabelsUpdate(t *testing.T) {
filteredRes = append(filteredRes, smpl) filteredRes = append(filteredRes, smpl)
} else { } else {
// If not 'ALERTS', it has to be 'ALERTS_FOR_STATE'. // If not 'ALERTS', it has to be 'ALERTS_FOR_STATE'.
testutil.Equals(t, smplName, "ALERTS_FOR_STATE") testutil.Equals(t, "ALERTS_FOR_STATE", smplName)
} }
} }
@ -217,7 +217,7 @@ func TestAlertingRuleExternalLabelsInTemplate(t *testing.T) {
filteredRes = append(filteredRes, smpl) filteredRes = append(filteredRes, smpl)
} else { } else {
// If not 'ALERTS', it has to be 'ALERTS_FOR_STATE'. // If not 'ALERTS', it has to be 'ALERTS_FOR_STATE'.
testutil.Equals(t, smplName, "ALERTS_FOR_STATE") testutil.Equals(t, "ALERTS_FOR_STATE", smplName)
} }
} }
@ -231,7 +231,7 @@ func TestAlertingRuleExternalLabelsInTemplate(t *testing.T) {
filteredRes = append(filteredRes, smpl) filteredRes = append(filteredRes, smpl)
} else { } else {
// If not 'ALERTS', it has to be 'ALERTS_FOR_STATE'. // If not 'ALERTS', it has to be 'ALERTS_FOR_STATE'.
testutil.Equals(t, smplName, "ALERTS_FOR_STATE") testutil.Equals(t, "ALERTS_FOR_STATE", smplName)
} }
} }
@ -287,7 +287,7 @@ func TestAlertingRuleEmptyLabelFromTemplate(t *testing.T) {
filteredRes = append(filteredRes, smpl) filteredRes = append(filteredRes, smpl)
} else { } else {
// If not 'ALERTS', it has to be 'ALERTS_FOR_STATE'. // If not 'ALERTS', it has to be 'ALERTS_FOR_STATE'.
testutil.Equals(t, smplName, "ALERTS_FOR_STATE") testutil.Equals(t, "ALERTS_FOR_STATE", smplName)
} }
} }
testutil.Equals(t, result, filteredRes) testutil.Equals(t, result, filteredRes)

2
rules/recording_test.go
View file

@ -74,7 +74,7 @@ func TestRuleEval(t *testing.T) {
rule := NewRecordingRule(test.name, test.expr, test.labels) rule := NewRecordingRule(test.name, test.expr, test.labels)
result, err := rule.Eval(ctx, now, EngineQueryFunc(engine, storage), nil) result, err := rule.Eval(ctx, now, EngineQueryFunc(engine, storage), nil)
testutil.Ok(t, err) testutil.Ok(t, err)
testutil.Equals(t, result, test.result) testutil.Equals(t, test.result, result)
} }
} }

14
storage/remote/intern_test.go
View file

@ -32,7 +32,7 @@ func TestIntern(t *testing.T) {
interner.intern(testString) interner.intern(testString)
interned, ok := interner.pool[testString] interned, ok := interner.pool[testString]
testutil.Equals(t, ok, true) testutil.Equals(t, true, ok)
testutil.Assert(t, interned.refs == 1, fmt.Sprintf("expected refs to be 1 but it was %d", interned.refs)) testutil.Assert(t, interned.refs == 1, fmt.Sprintf("expected refs to be 1 but it was %d", interned.refs))
} }
@ -42,13 +42,13 @@ func TestIntern_MultiRef(t *testing.T) {
interner.intern(testString) interner.intern(testString)
interned, ok := interner.pool[testString] interned, ok := interner.pool[testString]
testutil.Equals(t, ok, true) testutil.Equals(t, true, ok)
testutil.Assert(t, interned.refs == 1, fmt.Sprintf("expected refs to be 1 but it was %d", interned.refs)) testutil.Assert(t, interned.refs == 1, fmt.Sprintf("expected refs to be 1 but it was %d", interned.refs))
interner.intern(testString) interner.intern(testString)
interned, ok = interner.pool[testString] interned, ok = interner.pool[testString]
testutil.Equals(t, ok, true) testutil.Equals(t, true, ok)
testutil.Assert(t, interned.refs == 2, fmt.Sprintf("expected refs to be 2 but it was %d", interned.refs)) testutil.Assert(t, interned.refs == 2, fmt.Sprintf("expected refs to be 2 but it was %d", interned.refs))
} }
@ -58,12 +58,12 @@ func TestIntern_DeleteRef(t *testing.T) {
interner.intern(testString) interner.intern(testString)
interned, ok := interner.pool[testString] interned, ok := interner.pool[testString]
testutil.Equals(t, ok, true) testutil.Equals(t, true, ok)
testutil.Assert(t, interned.refs == 1, fmt.Sprintf("expected refs to be 1 but it was %d", interned.refs)) testutil.Assert(t, interned.refs == 1, fmt.Sprintf("expected refs to be 1 but it was %d", interned.refs))
interner.release(testString) interner.release(testString)
_, ok = interner.pool[testString] _, ok = interner.pool[testString]
testutil.Equals(t, ok, false) testutil.Equals(t, false, ok)
} }
func TestIntern_MultiRef_Concurrent(t *testing.T) { func TestIntern_MultiRef_Concurrent(t *testing.T) {
@ -71,7 +71,7 @@ func TestIntern_MultiRef_Concurrent(t *testing.T) {
interner.intern(testString) interner.intern(testString)
interned, ok := interner.pool[testString] interned, ok := interner.pool[testString]
testutil.Equals(t, ok, true) testutil.Equals(t, true, ok)
testutil.Assert(t, interned.refs == 1, fmt.Sprintf("expected refs to be 1 but it was %d", interned.refs)) testutil.Assert(t, interned.refs == 1, fmt.Sprintf("expected refs to be 1 but it was %d", interned.refs))
go interner.release(testString) go interner.release(testString)
@ -83,6 +83,6 @@ func TestIntern_MultiRef_Concurrent(t *testing.T) {
interner.mtx.RLock() interner.mtx.RLock()
interned, ok = interner.pool[testString] interned, ok = interner.pool[testString]
interner.mtx.RUnlock() interner.mtx.RUnlock()
testutil.Equals(t, ok, true) testutil.Equals(t, true, ok)
testutil.Assert(t, atomic.LoadInt64(&interned.refs) == 1, fmt.Sprintf("expected refs to be 1 but it was %d", interned.refs)) testutil.Assert(t, atomic.LoadInt64(&interned.refs) == 1, fmt.Sprintf("expected refs to be 1 but it was %d", interned.refs))
} }