base/util: drop format string argument from VerifyTranslations()

We now run each test fixture in a separate subtest, so there's no longer
ambiguity about which one failed.

base/util/test.go

@@ -15,7 +15,6 @@
 package util
 
 import (
-	"fmt"
 	"testing"
 
 	"github.com/coreos/butane/translate"
@@ -26,20 +25,19 @@ import (
 
 // VerifyTranslations ensures all the translations are identity, unless they
 // match a listed one, and verifies that all the listed ones exist.
-func VerifyTranslations(t *testing.T, set translate.TranslationSet, exceptions []translate.Translation, format string, args ...interface{}) {
-	message := fmt.Sprintf(format, args...)
+func VerifyTranslations(t *testing.T, set translate.TranslationSet, exceptions []translate.Translation) {
 	exceptionSet := translate.NewTranslationSet(set.FromTag, set.ToTag)
 	for _, ex := range exceptions {
 		exceptionSet.AddTranslation(ex.From, ex.To)
 		if tr, ok := set.Set[ex.To.String()]; ok {
-			assert.Equal(t, ex, tr, "%s: non-identity translation with unexpected From", message)
+			assert.Equal(t, ex, tr, "non-identity translation with unexpected From")
 		} else {
-			t.Errorf("%s: missing non-identity translation %v", message, ex)
+			t.Errorf("missing non-identity translation %v", ex)
 		}
 	}
 	for key, translation := range set.Set {
 		if _, ok := exceptionSet.Set[key]; !ok {
-			assert.Equal(t, translation.From.Path, translation.To.Path, "%s: translation is not identity", message)
+			assert.Equal(t, translation.From.Path, translation.To.Path, "translation is not identity")
 		}
 	}
 }

base/v0_1/translate_test.go

@@ -136,7 +136,7 @@ func TestTranslateFile(t *testing.T) {
 			actual, translations, r := translateFile(test.in, common.TranslateOptions{})
 			assert.Equal(t, test.out, actual, "translation mismatch")
 			assert.Equal(t, report.Report{}, r, "non-empty report")
-			baseutil.VerifyTranslations(t, translations, test.exceptions, "#%d", i)
+			baseutil.VerifyTranslations(t, translations, test.exceptions)
 			assert.NoError(t, translations.DebugVerifyCoverage(actual), "incomplete TranslationSet coverage")
 		})
 	}

base/v0_2/translate_test.go

@@ -459,7 +459,7 @@ func TestTranslateFile(t *testing.T) {
 			actual, translations, r := translateFile(test.in, test.options)
 			assert.Equal(t, test.out, actual, "translation mismatch")
 			assert.Equal(t, test.report, r.String(), "bad report")
-			baseutil.VerifyTranslations(t, translations, test.exceptions, "#%d", i)
+			baseutil.VerifyTranslations(t, translations, test.exceptions)
 			assert.NoError(t, translations.DebugVerifyCoverage(actual), "incomplete TranslationSet coverage")
 		})
 	}

base/v0_3/translate_test.go

@@ -459,7 +459,7 @@ func TestTranslateFile(t *testing.T) {
 			actual, translations, r := translateFile(test.in, test.options)
 			assert.Equal(t, test.out, actual, "translation mismatch")
 			assert.Equal(t, test.report, r.String(), "bad report")
-			baseutil.VerifyTranslations(t, translations, test.exceptions, "#%d", i)
+			baseutil.VerifyTranslations(t, translations, test.exceptions)
 			assert.NoError(t, translations.DebugVerifyCoverage(actual), "incomplete TranslationSet coverage")
 		})
 	}

base/v0_4/translate_test.go

@@ -459,7 +459,7 @@ func TestTranslateFile(t *testing.T) {
 			actual, translations, r := translateFile(test.in, test.options)
 			assert.Equal(t, test.out, actual, "translation mismatch")
 			assert.Equal(t, test.report, r.String(), "bad report")
-			baseutil.VerifyTranslations(t, translations, test.exceptions, "#%d", i)
+			baseutil.VerifyTranslations(t, translations, test.exceptions)
 			assert.NoError(t, translations.DebugVerifyCoverage(actual), "incomplete TranslationSet coverage")
 		})
 	}

base/v0_5_exp/translate_test.go

@@ -459,7 +459,7 @@ func TestTranslateFile(t *testing.T) {
 			actual, translations, r := translateFile(test.in, test.options)
 			assert.Equal(t, test.out, actual, "translation mismatch")
 			assert.Equal(t, test.report, r.String(), "bad report")
-			baseutil.VerifyTranslations(t, translations, test.exceptions, "#%d", i)
+			baseutil.VerifyTranslations(t, translations, test.exceptions)
 			assert.NoError(t, translations.DebugVerifyCoverage(actual), "incomplete TranslationSet coverage")
 		})
 	}

config/fcos/v1_3/translate_test.go

@@ -1415,7 +1415,7 @@ func TestTranslateBootDevice(t *testing.T) {
 			actual, translations, r := test.in.ToIgn3_2Unvalidated(common.TranslateOptions{})
 			assert.Equal(t, test.out, actual, "translation mismatch")
 			assert.Equal(t, test.report, r, "report mismatch")
-			baseutil.VerifyTranslations(t, translations, test.exceptions, "#%d", i)
+			baseutil.VerifyTranslations(t, translations, test.exceptions)
 			assert.NoError(t, translations.DebugVerifyCoverage(actual), "incomplete TranslationSet coverage")
 		})
 	}

config/fcos/v1_4/translate_test.go

@@ -1415,7 +1415,7 @@ func TestTranslateBootDevice(t *testing.T) {
 			actual, translations, r := test.in.ToIgn3_3Unvalidated(common.TranslateOptions{})
 			assert.Equal(t, test.out, actual, "translation mismatch")
 			assert.Equal(t, test.report, r, "report mismatch")
-			baseutil.VerifyTranslations(t, translations, test.exceptions, "#%d", i)
+			baseutil.VerifyTranslations(t, translations, test.exceptions)
 			assert.NoError(t, translations.DebugVerifyCoverage(actual), "incomplete TranslationSet coverage")
 		})
 	}

config/fcos/v1_5_exp/translate_test.go

@@ -1415,7 +1415,7 @@ func TestTranslateBootDevice(t *testing.T) {
 			actual, translations, r := test.in.ToIgn3_4Unvalidated(common.TranslateOptions{})
 			assert.Equal(t, test.out, actual, "translation mismatch")
 			assert.Equal(t, test.report, r, "report mismatch")
-			baseutil.VerifyTranslations(t, translations, test.exceptions, "#%d", i)
+			baseutil.VerifyTranslations(t, translations, test.exceptions)
 			assert.NoError(t, translations.DebugVerifyCoverage(actual), "incomplete TranslationSet coverage")
 		})
 	}

config/openshift/v4_10/translate_test.go

@@ -278,7 +278,7 @@ func TestTranslateConfig(t *testing.T) {
 			actual, translations, r := test.in.ToMachineConfig4_10Unvalidated(common.TranslateOptions{})
 			assert.Equal(t, test.out, actual, "translation mismatch")
 			assert.Equal(t, report.Report{}, r, "non-empty report")
-			baseutil.VerifyTranslations(t, translations, test.exceptions, "#%d", i)
+			baseutil.VerifyTranslations(t, translations, test.exceptions)
 			assert.NoError(t, translations.DebugVerifyCoverage(actual), "incomplete TranslationSet coverage")
 		})
 	}

config/openshift/v4_11_exp/translate_test.go

@@ -278,7 +278,7 @@ func TestTranslateConfig(t *testing.T) {
 			actual, translations, r := test.in.ToMachineConfig4_11Unvalidated(common.TranslateOptions{})
 			assert.Equal(t, test.out, actual, "translation mismatch")
 			assert.Equal(t, report.Report{}, r, "non-empty report")
-			baseutil.VerifyTranslations(t, translations, test.exceptions, "#%d", i)
+			baseutil.VerifyTranslations(t, translations, test.exceptions)
 			assert.NoError(t, translations.DebugVerifyCoverage(actual), "incomplete TranslationSet coverage")
 		})
 	}

config/openshift/v4_8/translate_test.go

@@ -349,7 +349,7 @@ func TestTranslateConfig(t *testing.T) {
 			actual, translations, r := test.in.ToMachineConfig4_8Unvalidated(common.TranslateOptions{})
 			assert.Equal(t, test.out, actual, "translation mismatch")
 			assert.Equal(t, report.Report{}, r, "non-empty report")
-			baseutil.VerifyTranslations(t, translations, test.exceptions, "#%d", i)
+			baseutil.VerifyTranslations(t, translations, test.exceptions)
 			assert.NoError(t, translations.DebugVerifyCoverage(actual), "incomplete TranslationSet coverage")
 		})
 	}

config/openshift/v4_9/translate_test.go

@@ -349,7 +349,7 @@ func TestTranslateConfig(t *testing.T) {
 			actual, translations, r := test.in.ToMachineConfig4_9Unvalidated(common.TranslateOptions{})
 			assert.Equal(t, test.out, actual, "translation mismatch")
 			assert.Equal(t, report.Report{}, r, "non-empty report")
-			baseutil.VerifyTranslations(t, translations, test.exceptions, "#%d", i)
+			baseutil.VerifyTranslations(t, translations, test.exceptions)
 			assert.NoError(t, translations.DebugVerifyCoverage(actual), "incomplete TranslationSet coverage")
 		})
 	}