fix conflict

Author: sivchari

.golangci.example.yml

@@ -628,8 +628,6 @@ linters-settings:
       begin: true
 
   tenv:
-    # The following configurations enable checks prior to Go 1.17.
-    force: false
     # The all option will run against all method in test file.
     # By default, only methods that take *testing.T, *testing.B, and testing.TB as arguments are checked.
     all: false

go.mod

@@ -69,7 +69,7 @@ require (
 	github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c
 	github.com/shirou/gopsutil/v3 v3.21.8
 	github.com/sirupsen/logrus v1.8.1
-	github.com/sivchari/tenv v1.1.6
+	github.com/sivchari/tenv v1.2.6
 	github.com/sonatard/noctx v0.0.1
 	github.com/sourcegraph/go-diff v0.6.1
 	github.com/spf13/cobra v1.2.1

go.sum

@@ -465,8 +465,7 @@ type ThelperSettings struct {
 }
 
 type TenvSettings struct {
-	Force bool `mapstructure:"force"`
-	All   bool `mapstructure:"all"`
+	All bool `mapstructure:"all"`
 }
 
 type UnparamSettings struct {

pkg/config/linters_settings.go

@@ -19,7 +19,6 @@ func NewTenv(settings *config.TenvSettings) *goanalysis.Linter {
 	if settings != nil {
 		cfg = map[string]map[string]interface{}{
 			a.Name: {
-				tenv.F: settings.Force,
 				tenv.A: settings.All,
 			},
 		}

pkg/golinters/tenv.go

@@ -1,4 +1,3 @@
 linters-settings:
   tenv:
-    force: true
     all: true

test/testdata/configs/tenv_all_force.yml renamed to test/testdata/configs/tenv_all.yml

@@ -1,5 +1,5 @@
 // args: -Etenv
-// config_path: testdata/configs/tenv_all_force.yml
+// config_path: testdata/configs/tenv_all.yml
 package testdata
 
 import (

test/testdata/configs/tenv_force.yml

@@ -19,22 +19,22 @@ func setup() {
 }
 
 func TestF(t *testing.T) {
-	os.Setenv("a", "b")                         // OK
-	if err := os.Setenv("a", "b"); err != nil { // OK
+	os.Setenv("a", "b")                         // ERROR "func TestF is not using testing.Setenv"
+	if err := os.Setenv("a", "b"); err != nil { // ERROR "func TestF is not using testing.Setenv"
 		_ = err
 	}
 }
 
 func BenchmarkF(b *testing.B) {
-	os.Setenv("a", "b")                         // OK
-	if err := os.Setenv("a", "b"); err != nil { // OK
+	os.Setenv("a", "b")                         // ERROR "func BenchmarkF is not using testing.Setenv"
+	if err := os.Setenv("a", "b"); err != nil { // ERROR "func BenchmarkF is not using testing.Setenv"
 		_ = err
 	}
 }
 
 func testTB(tb testing.TB) {
-	os.Setenv("a", "b")                         // OK
-	if err := os.Setenv("a", "b"); err != nil { // OK
+	os.Setenv("a", "b")                         // ERROR "func testTB is not using testing.Setenv"
+	if err := os.Setenv("a", "b"); err != nil { // ERROR "func testTB is not using testing.Setenv"
 		_ = err
 	}
 }