luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

fix TestStore_RegularTokens 

This test was only passing because t.Parallel was causing every subtest to run with the last value in the iteration,
which sets a value for all tokens. The test started to fail once t.Parallel was removed, but the same failure could
have been produced by adding 'tt := tt' to the t.Run() func.

These tests run in under 10ms, so there is no reason to use t.Parallel.
This commit is contained in:
Daniel Nephin 2020-08-24 17:46:55 -04:00
parent 335c604ced
commit fbae521775
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
agent/token/store_test.go
View File

@ -7,8 +7,6 @@ import (
) )
func TestStore_RegularTokens(t *testing.T) { func TestStore_RegularTokens(t *testing.T) {
t.Parallel()
type tokens struct { type tokens struct {
userSource TokenSource userSource TokenSource
user string user string
@ -89,13 +87,22 @@ func TestStore_RegularTokens(t *testing.T) {
} }
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
t.Parallel()
s := new(Store) s := new(Store)
require.True(t, s.UpdateUserToken(tt.set.user, tt.set.userSource)) if tt.set.user != "" {
require.True(t, s.UpdateAgentToken(tt.set.agent, tt.set.agentSource)) require.True(t, s.UpdateUserToken(tt.set.user, tt.set.userSource))
require.True(t, s.UpdateReplicationToken(tt.set.repl, tt.set.replSource)) }
require.True(t, s.UpdateAgentMasterToken(tt.set.master, tt.set.masterSource))
if tt.set.agent != "" {
require.True(t, s.UpdateAgentToken(tt.set.agent, tt.set.agentSource))
}
if tt.set.repl != "" {
require.True(t, s.UpdateReplicationToken(tt.set.repl, tt.set.replSource))
}
if tt.set.master != "" {
require.True(t, s.UpdateAgentMasterToken(tt.set.master, tt.set.masterSource))
}
// If they don't change then they return false. // If they don't change then they return false.
require.False(t, s.UpdateUserToken(tt.set.user, tt.set.userSource)) require.False(t, s.UpdateUserToken(tt.set.user, tt.set.userSource))
@ -128,7 +135,6 @@ func TestStore_RegularTokens(t *testing.T) {
} }
func TestStore_AgentMasterToken(t *testing.T) { func TestStore_AgentMasterToken(t *testing.T) {
t.Parallel()
s := new(Store) s := new(Store)
verify := func(want bool, toks ...string) { verify := func(want bool, toks ...string) {
@ -152,7 +158,6 @@ func TestStore_AgentMasterToken(t *testing.T) {
} }
func TestStore_Notify(t *testing.T) { func TestStore_Notify(t *testing.T) {
t.Parallel()
s := new(Store) s := new(Store)
newNotification := func(t *testing.T, s *Store, kind TokenKind) Notifier { newNotification := func(t *testing.T, s *Store, kind TokenKind) Notifier {