Skip to content

Commit e707d3a

Browse files
authored
[chore] Fix test usage of featuregate where errors are not checked (#13214)
Signed-off-by: Bogdan Drutu <[email protected]>
1 parent 808fa33 commit e707d3a

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

config/confighttp/compression_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ func TestHTTPClientCompression(t *testing.T) {
152152
}
153153
for _, tt := range tests {
154154
t.Run(tt.name, func(t *testing.T) {
155-
_ = featuregate.GlobalRegistry().Set(enableFramedSnappy.ID(), tt.framedSnappyEnabled)
155+
require.NoError(t, featuregate.GlobalRegistry().Set(enableFramedSnappy.ID(), tt.framedSnappyEnabled))
156156

157157
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
158158
body, err := io.ReadAll(r.Body)
@@ -352,7 +352,7 @@ func TestHTTPContentDecompressionHandler(t *testing.T) {
352352
}
353353
for _, tt := range tests {
354354
t.Run(tt.name, func(t *testing.T) {
355-
_ = featuregate.GlobalRegistry().Set(enableFramedSnappy.ID(), tt.framedSnappyEnabled)
355+
require.NoError(t, featuregate.GlobalRegistry().Set(enableFramedSnappy.ID(), tt.framedSnappyEnabled))
356356

357357
srv := httptest.NewServer(httpContentDecompressor(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
358358
body, err := io.ReadAll(r.Body)
@@ -523,7 +523,7 @@ func TestDecompressorAvoidDecompressionBomb(t *testing.T) {
523523
} {
524524
t.Run(tc.name, func(t *testing.T) {
525525
// t.Parallel() // TODO: Re-enable parallel tests once feature gate is removed. We can't parallelize since registry is shared.
526-
_ = featuregate.GlobalRegistry().Set(enableFramedSnappy.ID(), tc.framedSnappyEnabled)
526+
require.NoError(t, featuregate.GlobalRegistry().Set(enableFramedSnappy.ID(), tc.framedSnappyEnabled))
527527

528528
h := httpContentDecompressor(
529529
http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

otelcol/command_print_test.go

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,17 +71,16 @@ func TestPrintCommand(t *testing.T) {
7171
}
7272
for _, test := range tests {
7373
t.Run(test.name, func(t *testing.T) {
74-
err := featuregate.GlobalRegistry().Set(printCommandFeatureFlag.ID(), true)
75-
require.NoError(t, err)
74+
require.NoError(t, featuregate.GlobalRegistry().Set(printCommandFeatureFlag.ID(), true))
7675
defer func() {
77-
_ = featuregate.GlobalRegistry().Set(printCommandFeatureFlag.ID(), false)
76+
require.NoError(t, featuregate.GlobalRegistry().Set(printCommandFeatureFlag.ID(), false))
7877
}()
7978

8079
set := ConfigProviderSettings{
8180
ResolverSettings: test.set,
8281
}
8382
cmd := newConfigPrintSubCommand(CollectorSettings{ConfigProviderSettings: set}, flags(featuregate.GlobalRegistry()))
84-
err = cmd.Execute()
83+
err := cmd.Execute()
8584
if test.errString != "" {
8685
require.ErrorContains(t, err, test.errString)
8786
} else {
@@ -132,10 +131,9 @@ func TestConfig(t *testing.T) {
132131
}
133132
for _, test := range tests {
134133
t.Run(test.name, func(t *testing.T) {
135-
err := featuregate.GlobalRegistry().Set(printCommandFeatureFlag.ID(), true)
136-
require.NoError(t, err)
134+
require.NoError(t, featuregate.GlobalRegistry().Set(printCommandFeatureFlag.ID(), true))
137135
defer func() {
138-
_ = featuregate.GlobalRegistry().Set(printCommandFeatureFlag.ID(), false)
136+
require.NoError(t, featuregate.GlobalRegistry().Set(printCommandFeatureFlag.ID(), false))
139137
}()
140138
set := ConfigProviderSettings{
141139
ResolverSettings: confmap.ResolverSettings{

service/pipelines/config_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,7 @@ func TestNoPipelinesFeatureGate(t *testing.T) {
113113
require.Error(t, xconfmap.Validate(cfg))
114114

115115
gate := AllowNoPipelines
116-
err := featuregate.GlobalRegistry().Set(gate.ID(), true)
117-
require.NoError(t, err)
116+
require.NoError(t, featuregate.GlobalRegistry().Set(gate.ID(), true))
118117
defer func() {
119118
require.NoError(t, featuregate.GlobalRegistry().Set(gate.ID(), false))
120119
}()

0 commit comments

Comments
 (0)