refactor: rename test fixtures

Author: lzap

Makefile

@@ -20,7 +20,7 @@ generate-schema: ## Generate schema
 
 .PHONY: write-fixtures
 write-fixtures: ## Write new test fixtures
-	@rm -f ./fixtures/*.out.yaml ./fixtures/*.valid.out
+	@rm -f ./fixtures/*.out.yaml ./fixtures/*.validator.out
 	@WRITE_FIXTURES=1 go test -count=1 .
 
 .PHONY: pkg-go-dev-update

README.md

@@ -2,8 +2,8 @@ validation failed: jsonschema validation failed with 'blueprint-schema.json'
 - at '/installer': oneOf failed, none matched
   - at '/installer/anaconda': oneOf failed, none matched
     - at '/installer/anaconda': validation failed
-      - at '/installer/anaconda/sudo_nopasswd/0': 'invalid username' does not match pattern '^[%a-zA-Z0-9_.][a-zA-Z0-9_.$-]*$'
       - at '/installer/anaconda/enabled_modules/0': value must be one of 'org.fedoraproject.Anaconda.Modules.Localization', 'org.fedoraproject.Anaconda.Modules.Network', 'org.fedoraproject.Anaconda.Modules.Payloads', 'org.fedoraproject.Anaconda.Modules.Runtime', 'org.fedoraproject.Anaconda.Modules.Security', 'org.fedoraproject.Anaconda.Modules.Services', 'org.fedoraproject.Anaconda.Modules.Storage', 'org.fedoraproject.Anaconda.Modules.Subscription', 'org.fedoraproject.Anaconda.Modules.Timezone', 'org.fedoraproject.Anaconda.Modules.Users'
+      - at '/installer/anaconda/sudo_nopasswd/0': 'invalid username' does not match pattern '^[%a-zA-Z0-9_.][a-zA-Z0-9_.$-]*$'
       - at '/installer/anaconda': oneOf failed, subschemas 0, 1 matched
     - at '/installer/anaconda': got object, want null
   - at '/installer': got object, want null

fixtures/accounts.valid.out

@@ -124,28 +124,33 @@ func TestFix(t *testing.T) {
 				t.Fatal(err)
 			}
 			if writeFixtures {
-				outputFile, err := os.OpenFile(output, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0644)
-				if err != nil {
-					t.Fatal(err)
-				}
-				defer outputFile.Close()
+				schemaErr := schema.ValidateMap(data)
+				if schemaErr != nil && schemaErr.Error() != "" {
+					outFile, err := os.OpenFile(output, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0644)
+					if err != nil {
+						t.Fatal(err)
+					}
+					defer outFile.Close()
 
-				err = schema.ValidateMap(data)
-				if err != nil {
-					outputFile.WriteString(err.Error())
+					outFile.WriteString(schemaErr.Error())
+					t.Logf("Written %s", output)
 				}
-				t.Logf("Written %s", output)
 			} else {
-				outputFile, err := os.Open(output)
-				if err != nil {
-					t.Fatal(err)
-				}
-				defer outputFile.Close()
-				wantBuf, err := io.ReadAll(outputFile)
-				if err != nil {
-					t.Fatal(err)
+				var want string
+
+				// if file output exists
+				if _, err := os.Stat(output); err == nil {
+					inFile, err := os.Open(output)
+					if err != nil {
+						t.Fatal(err)
+					}
+					defer inFile.Close()
+					wantBuf, err := io.ReadAll(inFile)
+					if err != nil {
+						t.Fatal(err)
+					}
+					want = string(wantBuf)
 				}
-				want := string(wantBuf)
 
 				var got string
 				err = schema.ValidateMap(data)
@@ -174,7 +179,7 @@ func TestFix(t *testing.T) {
 		direction := filepath.Ext(fileWithoutFormat)
 		baseFile := file[0 : len(fileWithoutFormat)-len(direction)]
 		outFile := baseFile + ".out.yaml"
-		validFile := baseFile + ".valid.out"
+		validFile := baseFile + ".validator.out"
 
 		marshalTest(t, file, outFile)
 		validationTest(t, file, validFile)