X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=cmd%2Fsafcm-remote%2Fsync%2Ffiles_test.go;fp=cmd%2Fsafcm-remote%2Fsync%2Ffiles_test.go;h=e57401e3ada3c13b5d3e0edca9b37f06ab19d306;hb=4299c5d0946ecfa034e9eefe6b16e50bab94a820;hp=32130e928abbad99c77ed139fbc48373c28c1f32;hpb=992eaae7fec45c2d58fff89d1bc0ae920a899296;p=safcm%2Fsafcm.git

diff --git a/cmd/safcm-remote/sync/files_test.go b/cmd/safcm-remote/sync/files_test.go
index 32130e9..e57401e 100644
--- a/cmd/safcm-remote/sync/files_test.go
+++ b/cmd/safcm-remote/sync/files_test.go
@@ -842,59 +842,59 @@ 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)
-		if err != nil {
-			t.Fatal(err)
-		}
-		err = os.Chdir(path)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if tc.prepare != nil {
-			tc.prepare()
-		}
-
-		s, res := prepareSync(tc.req, &testRunner{
-			t:    t,
-		})
-		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("err = %#v, want %#v",
-				err, tc.expErr)
-		}
-		dbg := res.Wait()
-		// Remove random file names from result
-		for i, x := range dbg {
-			dbg[i] = randFilesRegexp.ReplaceAllString(x, `RND"`)
-		}
-		if !reflect.DeepEqual(tc.expDbg, dbg) {
-			t.Errorf("dbg: %s",
-				cmp.Diff(tc.expDbg, dbg))
-		}
-
-		files, err := ft.WalkDir(path)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if !reflect.DeepEqual(tc.expFiles, files) {
-			t.Errorf("files: %s",
-				cmp.Diff(tc.expFiles, files))
-		}
-
-		if !reflect.DeepEqual(tc.expResp, s.resp) {
-			t.Errorf("resp: %s",
-				cmp.Diff(tc.expResp, s.resp))
-		}
-		if !reflect.DeepEqual(tc.triggers, s.triggers) {
-			t.Errorf("triggers: %s",
-				cmp.Diff(tc.triggers, s.triggers))
-		}
+			// Create separate test directory for each test case
+			path := filepath.Join(cwd, "testdata", "files-"+tc.name)
+			err = os.Mkdir(path, 0700)
+			if err != nil {
+				t.Fatal(err)
+			}
+			err = os.Chdir(path)
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			if tc.prepare != nil {
+				tc.prepare()
+			}
+
+			s, res := prepareSync(tc.req, &testRunner{
+				t: t,
+			})
+			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("err = %#v, want %#v",
+					err, tc.expErr)
+			}
+			dbg := res.Wait()
+			// Remove random file names from result
+			for i, x := range dbg {
+				dbg[i] = randFilesRegexp.ReplaceAllString(x, `RND"`)
+			}
+			if !reflect.DeepEqual(tc.expDbg, dbg) {
+				t.Errorf("dbg: %s",
+					cmp.Diff(tc.expDbg, dbg))
+			}
+
+			files, err := ft.WalkDir(path)
+			if err != nil {
+				t.Fatal(err)
+			}
+			if !reflect.DeepEqual(tc.expFiles, files) {
+				t.Errorf("files: %s",
+					cmp.Diff(tc.expFiles, files))
+			}
+
+			if !reflect.DeepEqual(tc.expResp, s.resp) {
+				t.Errorf("resp: %s",
+					cmp.Diff(tc.expResp, s.resp))
+			}
+			if !reflect.DeepEqual(tc.triggers, s.triggers) {
+				t.Errorf("triggers: %s",
+					cmp.Diff(tc.triggers, s.triggers))
+			}
 		})
 	}
 
@@ -2397,63 +2397,63 @@ 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)
-		if err != nil {
-			t.Fatal(err)
-		}
-		err = os.Chdir(path)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if tc.prepare != nil {
-			tc.prepare()
-		}
-
-		s, res := prepareSync(tc.req, &testRunner{
-			t:    t,
-		})
-		s.setDefaults()
-
-		// Deterministic temporary symlink names
-		rand.Seed(0)
-
-		var changed bool
-		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("err = %#v, want %#v",
-				err, tc.expErr)
-		}
-		dbg := res.Wait()
-		// Remove random file names from result
-		for i, x := range dbg {
-			dbg[i] = randFilesRegexp.ReplaceAllString(x, `RND"`)
-		}
-		if !reflect.DeepEqual(tc.expDbg, dbg) {
-			t.Errorf("dbg: %s",
-				cmp.Diff(tc.expDbg, dbg))
-		}
-
-		files, err := ft.WalkDir(path)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if !reflect.DeepEqual(tc.expFiles, files) {
-			t.Errorf("files: %s",
-				cmp.Diff(tc.expFiles, files))
-		}
-
-		if tc.expChanged != changed {
-			t.Errorf("changed = %#v, want %#v",
-				changed, tc.expChanged)
-		}
-		if !reflect.DeepEqual(tc.expResp, s.resp) {
-			t.Errorf("resp: %s",
-				cmp.Diff(tc.expResp, s.resp))
-		}
+			// Create separate test directory for each test case
+			path := filepath.Join(cwd, "testdata", "file-"+tc.name)
+			err = os.Mkdir(path, 0700)
+			if err != nil {
+				t.Fatal(err)
+			}
+			err = os.Chdir(path)
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			if tc.prepare != nil {
+				tc.prepare()
+			}
+
+			s, res := prepareSync(tc.req, &testRunner{
+				t: t,
+			})
+			s.setDefaults()
+
+			// Deterministic temporary symlink names
+			rand.Seed(0)
+
+			var changed bool
+			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("err = %#v, want %#v",
+					err, tc.expErr)
+			}
+			dbg := res.Wait()
+			// Remove random file names from result
+			for i, x := range dbg {
+				dbg[i] = randFilesRegexp.ReplaceAllString(x, `RND"`)
+			}
+			if !reflect.DeepEqual(tc.expDbg, dbg) {
+				t.Errorf("dbg: %s",
+					cmp.Diff(tc.expDbg, dbg))
+			}
+
+			files, err := ft.WalkDir(path)
+			if err != nil {
+				t.Fatal(err)
+			}
+			if !reflect.DeepEqual(tc.expFiles, files) {
+				t.Errorf("files: %s",
+					cmp.Diff(tc.expFiles, files))
+			}
+
+			if tc.expChanged != changed {
+				t.Errorf("changed = %#v, want %#v",
+					changed, tc.expChanged)
+			}
+			if !reflect.DeepEqual(tc.expResp, s.resp) {
+				t.Errorf("resp: %s",
+					cmp.Diff(tc.expResp, s.resp))
+			}
 		})
 	}