tests: use subtests

[safcm/safcm.git] / cmd / safcm / config / groups_test.go

diff --git a/cmd/safcm/config/groups_test.go b/cmd/safcm/config/groups_test.go
index ccf096897859dd775b71a86f72919d8c597d87dc..68f18bad3bc5ec3d6ff93fa9ec6010ec9951c073 100644 (file)
--- a/cmd/safcm/config/groups_test.go
+++ b/cmd/safcm/config/groups_test.go
@@ -185,6 +185,7 @@ func TestLoadGroups(t *testing.T) {
        }
 
        for _, tc := range tests {
+               t.Run(tc.path, func(t *testing.T) {
                err := os.Chdir(tc.path)
                if err != nil {
                        t.Fatal(err)
@@ -193,19 +194,20 @@ func TestLoadGroups(t *testing.T) {
                res, err := LoadGroups(tc.cfg, tc.hosts)
 
                if !reflect.DeepEqual(tc.exp, res) {
-                       t.Errorf("%s: res: %s", tc.path,
+                       t.Errorf("res: %s",
                                cmp.Diff(tc.exp, res))
                }
                // Ugly but the simplest way to compare errors (including nil)
                if fmt.Sprintf("%s", err) != fmt.Sprintf("%s", tc.expErr) {
-                       t.Errorf("%s: err = %#v, want %#v",
-                               tc.path, err, tc.expErr)
+                       t.Errorf("err = %#v, want %#v",
+                               err, tc.expErr)
                }
 
                err = os.Chdir(cwd)
                if err != nil {
                        t.Fatal(err)
                }
+               })
        }
 }
 
@@ -315,15 +317,17 @@ func TestResolveHostGroups(t *testing.T) {
        }
 
        for _, tc := range tests {
+               t.Run(tc.name, func(t *testing.T) {
                res, err := ResolveHostGroups(tc.host, allGroups, tc.detected)
                if !reflect.DeepEqual(tc.exp, res) {
-                       t.Errorf("%s: res: %s", tc.name,
+                       t.Errorf("res: %s",
                                cmp.Diff(tc.exp, res))
                }
                // Ugly but the simplest way to compare errors (including nil)
                if fmt.Sprintf("%s", err) != fmt.Sprintf("%s", tc.expErr) {
-                       t.Errorf("%s: err = %#v, want %#v",
-                               tc.name, err, tc.expErr)
+                       t.Errorf("err = %#v, want %#v",
+                               err, tc.expErr)
                }
+               })
        }
 }