Enable gocritic

Signed-off-by: Kazuyoshi Kato <[email protected]>
go-openapi · Feb 14, 2022 · aa55e20 · aa55e20
1 parent e8d3222
commit aa55e20
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -40,7 +40,6 @@ linters:
     - paralleltest
     - cyclop # because we have gocyclo already
     # TODO: review the linters below. We disabled them to make the CI pass first.
-    - gocritic
     - containedctx
     - ireturn
     - varnamelen

diff --git a/jsonschema_test.go b/jsonschema_test.go
@@ -194,8 +194,7 @@ func TestOptionalJSONSchemaSuite(t *testing.T) {
 
 // Further testing with all formats recognized by strfmt
 func TestFormat_JSONSchemaExtended(t *testing.T) {
-	jsonFormatSchemaFixturesPath := filepath.Join(formatFixturesPath)
-	files, err := ioutil.ReadDir(jsonFormatSchemaFixturesPath)
+	files, err := ioutil.ReadDir(formatFixturesPath)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -213,7 +212,7 @@ func TestFormat_JSONSchemaExtended(t *testing.T) {
 				return
 			}
 			t.Log("Running [extended formats] " + specName)
-			b, _ := ioutil.ReadFile(filepath.Join(jsonFormatSchemaFixturesPath, fileName))
+			b, _ := ioutil.ReadFile(filepath.Join(formatFixturesPath, fileName))
 			doTestSchemaSuite(t, b)
 		})
 	}