From dc75f6c4875c4a47c6b9767a691f60c3c0cbf2e4 Mon Sep 17 00:00:00 2001 From: Tess Rinearson Date: Fri, 8 Jan 2021 12:00:13 +0100 Subject: [PATCH] test: use 'f' functions with formatting directives --- rpc/client/event_test.go | 2 +- rpc/client/rpc_test.go | 16 ++++++++-------- rpc/jsonrpc/client/args_test.go | 4 ++-- state/execution_test.go | 2 +- state/validation_test.go | 6 +++--- test/e2e/tests/evidence_test.go | 4 ++-- test/e2e/tests/net_test.go | 2 +- test/e2e/tests/validator_test.go | 10 +++++----- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/rpc/client/event_test.go b/rpc/client/event_test.go index 5734d6c1b..dded1b1ed 100644 --- a/rpc/client/event_test.go +++ b/rpc/client/event_test.go @@ -46,7 +46,7 @@ func TestHeaderEvents(t *testing.T) { evt, err := client.WaitForOneEvent(c, evtTyp, waitForEventTimeout) require.Nil(t, err, "%d: %+v", i, err) _, ok := evt.(types.EventDataNewBlockHeader) - require.True(t, ok, "%d: %#v", i, evt) + require.Truef(t, ok, "%d: %#v", i, evt) // TODO: more checks... }) } diff --git a/rpc/client/rpc_test.go b/rpc/client/rpc_test.go index ed719bed0..20007b120 100644 --- a/rpc/client/rpc_test.go +++ b/rpc/client/rpc_test.go @@ -121,9 +121,9 @@ func TestInfo(t *testing.T) { func TestNetInfo(t *testing.T) { for i, c := range GetClients() { nc, ok := c.(client.NetworkClient) - require.True(t, ok, "%d", i) + require.Truef(t, ok, "%d", i) netinfo, err := nc.NetInfo(context.Background()) - require.Nil(t, err, "%d: %+v", i, err) + require.Nilf(t, err, "%d: %+v", i, err) assert.True(t, netinfo.Listening) assert.Equal(t, 0, len(netinfo.Peers)) } @@ -133,7 +133,7 @@ func TestDumpConsensusState(t *testing.T) { for i, c := range GetClients() { // FIXME: fix server so it doesn't panic on invalid input nc, ok := c.(client.NetworkClient) - require.True(t, ok, "%d", i) + require.Truef(t, ok, "%d", i) cons, err := nc.DumpConsensusState(context.Background()) require.Nil(t, err, "%d: %+v", i, err) assert.NotEmpty(t, cons.RoundState) @@ -145,7 +145,7 @@ func TestConsensusState(t *testing.T) { for i, c := range GetClients() { // FIXME: fix server so it doesn't panic on invalid input nc, ok := c.(client.NetworkClient) - require.True(t, ok, "%d", i) + require.Truef(t, ok, "%d", i) cons, err := nc.ConsensusState(context.Background()) require.Nil(t, err, "%d: %+v", i, err) assert.NotEmpty(t, cons.RoundState) @@ -155,7 +155,7 @@ func TestConsensusState(t *testing.T) { func TestHealth(t *testing.T) { for i, c := range GetClients() { nc, ok := c.(client.NetworkClient) - require.True(t, ok, "%d", i) + require.Truef(t, ok, "%d", i) _, err := nc.Health(context.Background()) require.Nil(t, err, "%d: %+v", i, err) } @@ -416,7 +416,7 @@ func TestNumUnconfirmedTxs(t *testing.T) { mempoolSize := mempool.Size() for i, c := range GetClients() { mc, ok := c.(client.MempoolClient) - require.True(t, ok, "%d", i) + require.Truef(t, ok, "%d", i) res, err := mc.NumUnconfirmedTxs(context.Background()) require.Nil(t, err, "%d: %+v", i, err) @@ -621,9 +621,9 @@ func TestTxSearch(t *testing.T) { } require.Equal(t, txCount, result.TotalCount) for _, tx := range result.Txs { - require.False(t, seen[tx.Height], + require.Falsef(t, seen[tx.Height], "Found duplicate height %v in page %v", tx.Height, page) - require.Greater(t, tx.Height, maxHeight, + require.Greaterf(t, tx.Height, maxHeight, "Found decreasing height %v (max seen %v) in page %v", tx.Height, maxHeight, page) seen[tx.Height] = true maxHeight = tx.Height diff --git a/rpc/jsonrpc/client/args_test.go b/rpc/jsonrpc/client/args_test.go index 2506f3073..9da0c10ec 100644 --- a/rpc/jsonrpc/client/args_test.go +++ b/rpc/jsonrpc/client/args_test.go @@ -33,7 +33,7 @@ func TestArgToJSON(t *testing.T) { require.Nil(err, "%d: %+v", i, err) require.Equal(1, len(args), "%d", i) data, ok := args["data"].(string) - require.True(ok, "%d: %#v", i, args["data"]) - assert.Equal(tc.expected, data, "%d", i) + require.Truef(ok, "%d: %#v", i, args["data"]) + assert.Equalf(tc.expected, data, "%d", i) } } diff --git a/state/execution_test.go b/state/execution_test.go index 3d7fa93ab..3e0f57b9b 100644 --- a/state/execution_test.go +++ b/state/execution_test.go @@ -402,7 +402,7 @@ func TestEndBlockValidatorUpdates(t *testing.T) { select { case msg := <-updatesSub.Out(): event, ok := msg.Data().(types.EventDataValidatorSetUpdates) - require.True(t, ok, "Expected event of type EventDataValidatorSetUpdates, got %T", msg.Data()) + require.Truef(t, ok, "Expected event of type EventDataValidatorSetUpdates, got %T", msg.Data()) if assert.NotEmpty(t, event.ValidatorUpdates) { assert.Equal(t, pubkey, event.ValidatorUpdates[0].PubKey) assert.EqualValues(t, 10, event.ValidatorUpdates[0].VotingPower) diff --git a/state/validation_test.go b/state/validation_test.go index 0c9376581..a43a7bb9d 100644 --- a/state/validation_test.go +++ b/state/validation_test.go @@ -156,7 +156,7 @@ func TestValidateBlockCommit(t *testing.T) { block, _ := state.MakeBlock(height, makeTxs(height), wrongHeightCommit, nil, proposerAddr) err = blockExec.ValidateBlock(state, block) _, isErrInvalidCommitHeight := err.(types.ErrInvalidCommitHeight) - require.True(t, isErrInvalidCommitHeight, "expected ErrInvalidCommitHeight at height %d but got: %v", height, err) + require.Truef(t, isErrInvalidCommitHeight, "expected ErrInvalidCommitHeight at height %d but got: %v", height, err) /* #2589: test len(block.LastCommit.Signatures) == state.LastValidators.Size() @@ -164,7 +164,7 @@ func TestValidateBlockCommit(t *testing.T) { block, _ = state.MakeBlock(height, makeTxs(height), wrongSigsCommit, nil, proposerAddr) err = blockExec.ValidateBlock(state, block) _, isErrInvalidCommitSignatures := err.(types.ErrInvalidCommitSignatures) - require.True(t, isErrInvalidCommitSignatures, + require.Truef(t, isErrInvalidCommitSignatures, "expected ErrInvalidCommitSignatures at height %d, but got: %v", height, err, @@ -272,7 +272,7 @@ func TestValidateBlockEvidence(t *testing.T) { err := blockExec.ValidateBlock(state, block) if assert.Error(t, err) { _, ok := err.(*types.ErrEvidenceOverflow) - require.True(t, ok, "expected error to be of type ErrEvidenceOverflow at height %d but got %v", height, err) + require.Truef(t, ok, "expected error to be of type ErrEvidenceOverflow at height %d but got %v", height, err) } } diff --git a/test/e2e/tests/evidence_test.go b/test/e2e/tests/evidence_test.go index ea24b51e5..6d9d9b899 100644 --- a/test/e2e/tests/evidence_test.go +++ b/test/e2e/tests/evidence_test.go @@ -35,7 +35,7 @@ func TestEvidence_Misbehavior(t *testing.T) { // Check that evidence was as expected misbehavior, ok := node.Misbehaviors[nodeEvidence.Height()] - require.True(t, ok, "found unexpected evidence %v in height %v", + require.Truef(t, ok, "found unexpected evidence %v in height %v", nodeEvidence, block.Height) switch misbehavior { @@ -50,7 +50,7 @@ func TestEvidence_Misbehavior(t *testing.T) { // see if there is any evidence that we were expecting but didn't see for height, misbehavior := range node.Misbehaviors { _, ok := seenEvidence[height] - require.True(t, ok, "expected evidence for %v misbehavior at height %v by node but was never found", + require.Truef(t, ok, "expected evidence for %v misbehavior at height %v by node but was never found", misbehavior, height) } }) diff --git a/test/e2e/tests/net_test.go b/test/e2e/tests/net_test.go index 1ca43fa05..46f8a67bb 100644 --- a/test/e2e/tests/net_test.go +++ b/test/e2e/tests/net_test.go @@ -40,7 +40,7 @@ func TestNet_Peers(t *testing.T) { } for name := range seen { - require.True(t, seen[name], "node %v not peered with %v", node.Name, name) + require.Truef(t, seen[name], "node %v not peered with %v", node.Name, name) } }) } diff --git a/test/e2e/tests/validator_test.go b/test/e2e/tests/validator_test.go index 8a36bb55d..6de6e8acc 100644 --- a/test/e2e/tests/validator_test.go +++ b/test/e2e/tests/validator_test.go @@ -75,9 +75,9 @@ func TestValidator_Propose(t *testing.T) { valSchedule.Increment(1) } - require.False(t, proposeCount == 0 && expectCount > 0, + require.Falsef(t, proposeCount == 0 && expectCount > 0, "node did not propose any blocks (expected %v)", expectCount) - require.Less(t, expectCount-proposeCount, 5, + require.Lessf(t, expectCount-proposeCount, 5, "validator missed proposing too many blocks (proposed %v out of %v)", proposeCount, expectCount) }) } @@ -109,14 +109,14 @@ func TestValidator_Sign(t *testing.T) { signCount++ } } else { - require.False(t, signed, "unexpected signature for block %v", block.LastCommit.Height) + require.Falsef(t, signed, "unexpected signature for block %v", block.LastCommit.Height) } valSchedule.Increment(1) } - require.False(t, signCount == 0 && expectCount > 0, + require.Falsef(t, signCount == 0 && expectCount > 0, "node did not sign any blocks (expected %v)", expectCount) - require.Less(t, float64(expectCount-signCount)/float64(expectCount), 0.5, + require.Lessf(t, float64(expectCount-signCount)/float64(expectCount), 0.5, "validator missed signing too many blocks (signed %v out of %v)", signCount, expectCount) }) }