Update copyright years

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

diff --git a/cmd/safcm/config/hosts_test.go b/cmd/safcm/config/hosts_test.go
index 95f4e7531936084ba01548f5ae9aa2fdf026c49d..4c4e970e59e4a2b057f050ac3679b91f5df92719 100644 (file)
--- a/cmd/safcm/config/hosts_test.go
+++ b/cmd/safcm/config/hosts_test.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2021  Simon Ruderich
+// Copyright (C) 2021-2022  Simon Ruderich
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -19,10 +19,9 @@ import (
        "fmt"
        "os"
        "path/filepath"
-       "reflect"
        "testing"
 
-       "github.com/google/go-cmp/cmp"
+       "ruderich.org/simon/safcm/testutil"
 )
 
 func TestLoadHosts(t *testing.T) {
@@ -30,7 +29,7 @@ func TestLoadHosts(t *testing.T) {
        if err != nil {
                t.Fatal(err)
        }
-       defer os.Chdir(cwd)
+       defer os.Chdir(cwd) //nolint:errcheck
 
        sliceToHosts := func(hosts []*Host) *Hosts {
                res := &Hosts{
@@ -65,6 +64,11 @@ func TestLoadHosts(t *testing.T) {
                        nil,
                },
 
+               {
+                       "../testdata/host-invalid-duplicate",
+                       nil,
+                       fmt.Errorf("hosts.yaml: host \"host1.example.org\": host name already exists"),
+               },
                {
                        "../testdata/host-invalid-all",
                        nil,
@@ -90,15 +94,8 @@ func TestLoadHosts(t *testing.T) {
                        }
 
                        res, err := LoadHosts()
-
-                       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)
-                       }
+                       testutil.AssertEqual(t, "res", res, tc.exp)
+                       testutil.AssertErrorEqual(t, "err", err, tc.expErr)
                })
        }
 }