tests: use subtests

[safcm/safcm.git] / cmd / safcm-remote / sync / files_test.go

diff --git a/cmd/safcm-remote/sync/files_test.go b/cmd/safcm-remote/sync/files_test.go
index c5c7216f81228debd074aa72a558ce97e64a9394..32130e928abbad99c77ed139fbc48373c28c1f32 100644 (file)
--- a/cmd/safcm-remote/sync/files_test.go
+++ b/cmd/safcm-remote/sync/files_test.go
@@ -841,6 +841,7 @@ func TestSyncFiles(t *testing.T) {
        }
 
        for _, tc := range tests {
+               t.Run(tc.name, func(t *testing.T) {
                // Create separate test directory for each test case
                path := filepath.Join(cwd, "testdata", "files-"+tc.name)
                err = os.Mkdir(path, 0700)
@@ -858,15 +859,14 @@ func TestSyncFiles(t *testing.T) {
 
                s, res := prepareSync(tc.req, &testRunner{
                        t:    t,
-                       name: tc.name,
                })
                s.setDefaults()
 
                err := s.syncFiles()
                // 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)
                }
                dbg := res.Wait()
                // Remove random file names from result
@@ -874,7 +874,7 @@ func TestSyncFiles(t *testing.T) {
                        dbg[i] = randFilesRegexp.ReplaceAllString(x, `RND"`)
                }
                if !reflect.DeepEqual(tc.expDbg, dbg) {
-                       t.Errorf("%s: dbg: %s", tc.name,
+                       t.Errorf("dbg: %s",
                                cmp.Diff(tc.expDbg, dbg))
                }
 
@@ -883,18 +883,19 @@ func TestSyncFiles(t *testing.T) {
                        t.Fatal(err)
                }
                if !reflect.DeepEqual(tc.expFiles, files) {
-                       t.Errorf("%s: files: %s", tc.name,
+                       t.Errorf("files: %s",
                                cmp.Diff(tc.expFiles, files))
                }
 
                if !reflect.DeepEqual(tc.expResp, s.resp) {
-                       t.Errorf("%s: resp: %s", tc.name,
+                       t.Errorf("resp: %s",
                                cmp.Diff(tc.expResp, s.resp))
                }
                if !reflect.DeepEqual(tc.triggers, s.triggers) {
-                       t.Errorf("%s: triggers: %s", tc.name,
+                       t.Errorf("triggers: %s",
                                cmp.Diff(tc.triggers, s.triggers))
                }
+               })
        }
 
        os.Remove(tmpTestFilePath)
@@ -2395,6 +2396,7 @@ file
        }
 
        for _, tc := range tests {
+               t.Run(tc.name, func(t *testing.T) {
                // Create separate test directory for each test case
                path := filepath.Join(cwd, "testdata", "file-"+tc.name)
                err = os.Mkdir(path, 0700)
@@ -2412,7 +2414,6 @@ file
 
                s, res := prepareSync(tc.req, &testRunner{
                        t:    t,
-                       name: tc.name,
                })
                s.setDefaults()
 
@@ -2423,8 +2424,8 @@ file
                err := s.syncFile(tc.file, &changed)
                // 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)
                }
                dbg := res.Wait()
                // Remove random file names from result
@@ -2432,7 +2433,7 @@ file
                        dbg[i] = randFilesRegexp.ReplaceAllString(x, `RND"`)
                }
                if !reflect.DeepEqual(tc.expDbg, dbg) {
-                       t.Errorf("%s: dbg: %s", tc.name,
+                       t.Errorf("dbg: %s",
                                cmp.Diff(tc.expDbg, dbg))
                }
 
@@ -2441,18 +2442,19 @@ file
                        t.Fatal(err)
                }
                if !reflect.DeepEqual(tc.expFiles, files) {
-                       t.Errorf("%s: files: %s", tc.name,
+                       t.Errorf("files: %s",
                                cmp.Diff(tc.expFiles, files))
                }
 
                if tc.expChanged != changed {
-                       t.Errorf("%s: changed = %#v, want %#v",
-                               tc.name, changed, tc.expChanged)
+                       t.Errorf("changed = %#v, want %#v",
+                               changed, tc.expChanged)
                }
                if !reflect.DeepEqual(tc.expResp, s.resp) {
-                       t.Errorf("%s: resp: %s", tc.name,
+                       t.Errorf("resp: %s",
                                cmp.Diff(tc.expResp, s.resp))
                }
+               })
        }
 
        if !t.Failed() {