Skip to content

Commit 1e56675

Browse files
authored
fix flag tests (#2254)
1 parent 1def6ce commit 1e56675

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

cmd/flags_test.go

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func parseArgs(t *FlagsTest, args []string) (flags *flagStorage) {
6262
// Tests
6363
////////////////////////////////////////////////////////////////////////
6464

65-
func (t *FlagsTest) Defaults() {
65+
func (t *FlagsTest) TestDefaults() {
6666
f := parseArgs(t, []string{})
6767

6868
// File system
@@ -71,28 +71,28 @@ func (t *FlagsTest) Defaults() {
7171

7272
assert.Equal(t.T(), os.FileMode(0755), f.DirMode)
7373
assert.Equal(t.T(), os.FileMode(0644), f.FileMode)
74-
assert.Equal(t.T(), -1, f.Uid)
75-
assert.Equal(t.T(), -1, f.Gid)
74+
assert.EqualValues(t.T(), -1, f.Uid)
75+
assert.EqualValues(t.T(), -1, f.Gid)
7676
assert.False(t.T(), f.ImplicitDirs)
77-
assert.False(t.T(), f.IgnoreInterrupts)
77+
assert.True(t.T(), f.IgnoreInterrupts)
7878
assert.Equal(t.T(), config.DefaultKernelListCacheTtlSeconds, f.KernelListCacheTtlSeconds)
7979

8080
// GCS
8181
assert.Equal(t.T(), "", f.KeyFile)
82-
assert.Equal(t.T(), -1, f.EgressBandwidthLimitBytesPerSecond)
83-
assert.Equal(t.T(), -1, f.OpRateLimitHz)
82+
assert.EqualValues(t.T(), -1, f.EgressBandwidthLimitBytesPerSecond)
83+
assert.EqualValues(t.T(), -1, f.OpRateLimitHz)
8484
assert.True(t.T(), f.ReuseTokenFromUrl)
85-
assert.Equal(t.T(), nil, f.CustomEndpoint)
85+
assert.Nil(t.T(), f.CustomEndpoint)
8686
assert.False(t.T(), f.AnonymousAccess)
8787

8888
// Tuning
8989
assert.Equal(t.T(), mount.DefaultStatCacheCapacity, f.StatCacheCapacity)
9090
assert.Equal(t.T(), mount.DefaultStatOrTypeCacheTTL, f.StatCacheTTL)
9191
assert.Equal(t.T(), mount.DefaultStatOrTypeCacheTTL, f.TypeCacheTTL)
92-
assert.Equal(t.T(), 0, f.HttpClientTimeout)
92+
assert.EqualValues(t.T(), 0, f.HttpClientTimeout)
9393
assert.Equal(t.T(), "", f.TempDir)
9494
assert.Equal(t.T(), config.DefaultMaxRetryAttempts, f.MaxRetryAttempts)
95-
assert.Equal(t.T(), 2, f.RetryMultiplier)
95+
assert.EqualValues(t.T(), 2, f.RetryMultiplier)
9696
assert.False(t.T(), f.EnableNonexistentTypeCache)
9797
assert.Equal(t.T(), 0, f.MaxConnsPerHost)
9898

@@ -108,7 +108,7 @@ func (t *FlagsTest) Defaults() {
108108
assert.Equal(t.T(), 0, f.PrometheusPort)
109109
}
110110

111-
func (t *FlagsTest) Bools() {
111+
func (t *FlagsTest) TestBools() {
112112
names := []string{
113113
"implicit-dirs",
114114
"reuse-token-from-url",
@@ -172,7 +172,7 @@ func (t *FlagsTest) Bools() {
172172
assert.True(t.T(), f.EnableNonexistentTypeCache)
173173
}
174174

175-
func (t *FlagsTest) DecimalNumbers() {
175+
func (t *FlagsTest) TestDecimalNumbers() {
176176
args := []string{
177177
"--uid=17",
178178
"--gid=19",
@@ -186,18 +186,18 @@ func (t *FlagsTest) DecimalNumbers() {
186186
}
187187

188188
f := parseArgs(t, args)
189-
assert.Equal(t.T(), 17, f.Uid)
190-
assert.Equal(t.T(), 19, f.Gid)
189+
assert.EqualValues(t.T(), 17, f.Uid)
190+
assert.EqualValues(t.T(), 19, f.Gid)
191191
assert.Equal(t.T(), 123.4, f.EgressBandwidthLimitBytesPerSecond)
192192
assert.Equal(t.T(), 56.78, f.OpRateLimitHz)
193193
assert.Equal(t.T(), 8192, f.StatCacheCapacity)
194194
assert.Equal(t.T(), 100, f.MaxIdleConnsPerHost)
195195
assert.Equal(t.T(), 100, f.MaxConnsPerHost)
196-
assert.Equal(t.T(), 234, f.KernelListCacheTtlSeconds)
197-
assert.Equal(t.T(), 100, f.MaxRetryAttempts)
196+
assert.EqualValues(t.T(), 234, f.KernelListCacheTtlSeconds)
197+
assert.EqualValues(t.T(), 100, f.MaxRetryAttempts)
198198
}
199199

200-
func (t *FlagsTest) OctalNumbers() {
200+
func (t *FlagsTest) TestOctalNumbers() {
201201
args := []string{
202202
"--dir-mode=711",
203203
"--file-mode", "611",
@@ -208,7 +208,7 @@ func (t *FlagsTest) OctalNumbers() {
208208
assert.Equal(t.T(), os.FileMode(0611), f.FileMode)
209209
}
210210

211-
func (t *FlagsTest) Strings() {
211+
func (t *FlagsTest) TestStrings() {
212212
args := []string{
213213
"--key-file", "-asdf",
214214
"--temp-dir=foobar",
@@ -225,7 +225,7 @@ func (t *FlagsTest) Strings() {
225225
assert.Equal(t.T(), config.ExperimentalMetadataPrefetchOnMountAsynchronous, f.ExperimentalMetadataPrefetchOnMount)
226226
}
227227

228-
func (t *FlagsTest) Durations() {
228+
func (t *FlagsTest) TestDurations() {
229229
args := []string{
230230
"--stat-cache-ttl", "1m17s100ms",
231231
"--type-cache-ttl", "50s900ms",
@@ -241,7 +241,7 @@ func (t *FlagsTest) Durations() {
241241
assert.Equal(t.T(), 30*time.Second, f.MaxRetrySleep)
242242
}
243243

244-
func (t *FlagsTest) Maps() {
244+
func (t *FlagsTest) TestMaps() {
245245
args := []string{
246246
"-o", "rw,nodev",
247247
"-o", "user=jacobsa,noauto",

0 commit comments

Comments
 (0)