X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=remote%2Fainsl%2Fainsl_test.go;h=ecb1290d6f5cc0018ad52633931a953e1a4cf093;hb=4206e0dbca82f5df7d8e534f78cb737979880916;hp=3d391f0ce49ceaf5e68eb1052e0ddae1bc3671fa;hpb=9269fa3c94e700afc0be823f58ea473a2db8f3dc;p=safcm%2Fsafcm.git

diff --git a/remote/ainsl/ainsl_test.go b/remote/ainsl/ainsl_test.go
index 3d391f0..ecb1290 100644
--- a/remote/ainsl/ainsl_test.go
+++ b/remote/ainsl/ainsl_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
@@ -33,7 +33,7 @@ func TestHandle(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	defer os.Chdir(cwd)
+	defer os.Chdir(cwd) //nolint:errcheck
 
 	err = os.RemoveAll("testdata")
 	if err != nil {
@@ -54,10 +54,10 @@ func TestHandle(t *testing.T) {
 	}
 	_, uid, _, gid := ft.CurrentUserAndGroup()
 
-	symlinkExists := "open file: too many levels of symbolic links"
+	symlinkExists := "\"file\": too many levels of symbolic links"
 	if runtime.GOOS == "freebsd" {
 		// EMLINK instead of ELOOP
-		symlinkExists = "open file: too many links"
+		symlinkExists = "\"file\": too many links"
 	}
 
 	tests := []struct {
@@ -94,7 +94,7 @@ func TestHandle(t *testing.T) {
 			nil,
 			[]ft.File{
 				root,
-				ft.File{
+				{
 					Path: "file",
 					Mode: 0640,
 					Data: []byte("line\n"),
@@ -141,7 +141,7 @@ func TestHandle(t *testing.T) {
 			},
 			[]ft.File{
 				root,
-				ft.File{
+				{
 					Path: "file",
 					Mode: 0641,
 					Data: []byte("line\n"),
@@ -161,7 +161,7 @@ func TestHandle(t *testing.T) {
 			},
 			[]ft.File{
 				root,
-				ft.File{
+				{
 					Path: "file",
 					Mode: 0641,
 					Data: []byte("existing\nline\n"),
@@ -182,7 +182,7 @@ func TestHandle(t *testing.T) {
 			},
 			[]ft.File{
 				root,
-				ft.File{
+				{
 					Path: "file",
 					Mode: 0641,
 					Data: []byte("existing\nline\n"),
@@ -204,7 +204,7 @@ func TestHandle(t *testing.T) {
 			},
 			[]ft.File{
 				root,
-				ft.File{
+				{
 					Path: "file",
 					Mode: 0641,
 					Data: []byte("first\nline\n"),
@@ -225,7 +225,7 @@ func TestHandle(t *testing.T) {
 			},
 			[]ft.File{
 				root,
-				ft.File{
+				{
 					Path: "file",
 					Mode: 0641,
 					Data: []byte("first\nline\n"),
@@ -246,7 +246,7 @@ func TestHandle(t *testing.T) {
 			},
 			[]ft.File{
 				root,
-				ft.File{
+				{
 					Path: "file",
 					Mode: 0641,
 					Data: []byte("# line with spaces\nline with spaces\n"),
@@ -268,7 +268,7 @@ func TestHandle(t *testing.T) {
 			},
 			[]ft.File{
 				root,
-				ft.File{
+				{
 					Path: "file",
 					Mode: fs.ModeSymlink | 0777,
 					Data: []byte("target"),
@@ -287,13 +287,13 @@ func TestHandle(t *testing.T) {
 			},
 			[]ft.File{
 				root,
-				ft.File{
+				{
 					Path: "file",
 					Mode: fs.ModeNamedPipe | 0640,
 				},
 			},
 			nil,
-			fmt.Errorf("\"file\" is not a regular file but p---------"),
+			fmt.Errorf("\"file\": not a regular file but p---------"),
 		},
 	}