Skip to content

Commit 04d9fe3

Browse files
kylecarbskylecarbs
committed
Merge branch 'f0ssel/fix-lint' into plugincache
2 parents f2e6cfa + 064eb81 commit 04d9fe3

1 file changed

Lines changed: 18 additions & 18 deletions

File tree

‎cli/cliflag/cliflag_test.go‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ import (
1616
//nolint:paralleltest
1717
func TestCliflag(t *testing.T) {
1818
t.Run("StringDefault", func(t *testing.T) {
19-
var p string
19+
var ptr string
2020
flagset, name, shorthand, env, usage := randomFlag()
2121
def, _ := cryptorand.String(10)
2222

23-
cliflag.StringVarP(flagset, &p, name, shorthand, env, def, usage)
23+
cliflag.StringVarP(flagset, &ptr, name, shorthand, env, def, usage)
2424
got, err := flagset.GetString(name)
2525
require.NoError(t, err)
2626
require.Equal(t, def, got)
@@ -29,24 +29,24 @@ func TestCliflag(t *testing.T) {
2929
})
3030

3131
t.Run("StringEnvVar", func(t *testing.T) {
32-
var p string
32+
var ptr string
3333
flagset, name, shorthand, env, usage := randomFlag()
3434
envValue, _ := cryptorand.String(10)
3535
t.Setenv(env, envValue)
3636
def, _ := cryptorand.String(10)
3737

38-
cliflag.StringVarP(flagset, &p, name, shorthand, env, def, usage)
38+
cliflag.StringVarP(flagset, &ptr, name, shorthand, env, def, usage)
3939
got, err := flagset.GetString(name)
4040
require.NoError(t, err)
4141
require.Equal(t, envValue, got)
4242
})
4343

4444
t.Run("EmptyEnvVar", func(t *testing.T) {
45-
var p string
45+
var ptr string
4646
flagset, name, shorthand, _, usage := randomFlag()
4747
def, _ := cryptorand.String(10)
4848

49-
cliflag.StringVarP(flagset, &p, name, shorthand, "", def, usage)
49+
cliflag.StringVarP(flagset, &ptr, name, shorthand, "", def, usage)
5050
got, err := flagset.GetString(name)
5151
require.NoError(t, err)
5252
require.Equal(t, def, got)
@@ -55,11 +55,11 @@ func TestCliflag(t *testing.T) {
5555
})
5656

5757
t.Run("IntDefault", func(t *testing.T) {
58-
var p uint8
58+
var ptr uint8
5959
flagset, name, shorthand, env, usage := randomFlag()
6060
def, _ := cryptorand.Int63n(10)
6161

62-
cliflag.Uint8VarP(flagset, &p, name, shorthand, env, uint8(def), usage)
62+
cliflag.Uint8VarP(flagset, &ptr, name, shorthand, env, uint8(def), usage)
6363
got, err := flagset.GetUint8(name)
6464
require.NoError(t, err)
6565
require.Equal(t, uint8(def), got)
@@ -68,37 +68,37 @@ func TestCliflag(t *testing.T) {
6868
})
6969

7070
t.Run("IntEnvVar", func(t *testing.T) {
71-
var p uint8
71+
var ptr uint8
7272
flagset, name, shorthand, env, usage := randomFlag()
7373
envValue, _ := cryptorand.Int63n(10)
7474
t.Setenv(env, strconv.FormatUint(uint64(envValue), 10))
7575
def, _ := cryptorand.Int()
7676

77-
cliflag.Uint8VarP(flagset, &p, name, shorthand, env, uint8(def), usage)
77+
cliflag.Uint8VarP(flagset, &ptr, name, shorthand, env, uint8(def), usage)
7878
got, err := flagset.GetUint8(name)
7979
require.NoError(t, err)
8080
require.Equal(t, uint8(envValue), got)
8181
})
8282

8383
t.Run("IntFailParse", func(t *testing.T) {
84-
var p uint8
84+
var ptr uint8
8585
flagset, name, shorthand, env, usage := randomFlag()
8686
envValue, _ := cryptorand.String(10)
8787
t.Setenv(env, envValue)
8888
def, _ := cryptorand.Int63n(10)
8989

90-
cliflag.Uint8VarP(flagset, &p, name, shorthand, env, uint8(def), usage)
90+
cliflag.Uint8VarP(flagset, &ptr, name, shorthand, env, uint8(def), usage)
9191
got, err := flagset.GetUint8(name)
9292
require.NoError(t, err)
9393
require.Equal(t, uint8(def), got)
9494
})
9595

9696
t.Run("BoolDefault", func(t *testing.T) {
97-
var p bool
97+
var ptr bool
9898
flagset, name, shorthand, env, usage := randomFlag()
9999
def, _ := cryptorand.Bool()
100100

101-
cliflag.BoolVarP(flagset, &p, name, shorthand, env, def, usage)
101+
cliflag.BoolVarP(flagset, &ptr, name, shorthand, env, def, usage)
102102
got, err := flagset.GetBool(name)
103103
require.NoError(t, err)
104104
require.Equal(t, def, got)
@@ -107,26 +107,26 @@ func TestCliflag(t *testing.T) {
107107
})
108108

109109
t.Run("BoolEnvVar", func(t *testing.T) {
110-
var p bool
110+
var ptr bool
111111
flagset, name, shorthand, env, usage := randomFlag()
112112
envValue, _ := cryptorand.Bool()
113113
t.Setenv(env, strconv.FormatBool(envValue))
114114
def, _ := cryptorand.Bool()
115115

116-
cliflag.BoolVarP(flagset, &p, name, shorthand, env, def, usage)
116+
cliflag.BoolVarP(flagset, &ptr, name, shorthand, env, def, usage)
117117
got, err := flagset.GetBool(name)
118118
require.NoError(t, err)
119119
require.Equal(t, envValue, got)
120120
})
121121

122122
t.Run("BoolFailParse", func(t *testing.T) {
123-
var p bool
123+
var ptr bool
124124
flagset, name, shorthand, env, usage := randomFlag()
125125
envValue, _ := cryptorand.String(10)
126126
t.Setenv(env, envValue)
127127
def, _ := cryptorand.Bool()
128128

129-
cliflag.BoolVarP(flagset, &p, name, shorthand, env, def, usage)
129+
cliflag.BoolVarP(flagset, &ptr, name, shorthand, env, def, usage)
130130
got, err := flagset.GetBool(name)
131131
require.NoError(t, err)
132132
require.Equal(t, def, got)

0 commit comments

Comments
 (0)