X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=cmd%2Fsafcm%2Fconfig%2Fgroups_test.go;h=b2bf5ec41d9027ecf39ebc6783dec321a936d885;hb=4299c5d0946ecfa034e9eefe6b16e50bab94a820;hp=ccf096897859dd775b71a86f72919d8c597d87dc;hpb=f2f2bc47e8729548f3c10117f7f008b547c4afc5;p=safcm%2Fsafcm.git diff --git a/cmd/safcm/config/groups_test.go b/cmd/safcm/config/groups_test.go index ccf0968..b2bf5ec 100644 --- a/cmd/safcm/config/groups_test.go +++ b/cmd/safcm/config/groups_test.go @@ -185,27 +185,28 @@ func TestLoadGroups(t *testing.T) { } for _, tc := range tests { - err := os.Chdir(tc.path) - if err != nil { - t.Fatal(err) - } + t.Run(tc.path, func(t *testing.T) { + err := os.Chdir(tc.path) + if err != nil { + t.Fatal(err) + } - res, err := LoadGroups(tc.cfg, tc.hosts) + res, err := LoadGroups(tc.cfg, tc.hosts) - if !reflect.DeepEqual(tc.exp, res) { - t.Errorf("%s: res: %s", tc.path, - 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) - } + if !reflect.DeepEqual(tc.exp, res) { + 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("err = %#v, want %#v", + err, tc.expErr) + } - err = os.Chdir(cwd) - if err != nil { - t.Fatal(err) - } + err = os.Chdir(cwd) + if err != nil { + t.Fatal(err) + } + }) } } @@ -315,15 +316,17 @@ func TestResolveHostGroups(t *testing.T) { } for _, tc := range tests { - res, err := ResolveHostGroups(tc.host, allGroups, tc.detected) - if !reflect.DeepEqual(tc.exp, res) { - t.Errorf("%s: res: %s", tc.name, - 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.Run(tc.name, func(t *testing.T) { + res, err := ResolveHostGroups(tc.host, allGroups, + tc.detected) + if !reflect.DeepEqual(tc.exp, res) { + 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("err = %#v, want %#v", + err, tc.expErr) + } + }) } }