copier tests: fixup require/assert calls and format-specified errors

Fixup cases where we were passing a format specifier for the error
detail when calling an assert or require helper function, but not using
the variant of the helper function that expects a format specifier, and
cases where we weren't passing a format specifier, but were using the
variant that expects one.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>

Author: nalind

copier/copier_test.go

@@ -505,7 +505,7 @@ func testPut(ctx context.Context, t *testing.T, expectedError error) {
 				if !reflect.DeepEqual(expected, fileList) && reflect.DeepEqual(moddedEnumeratedFiles(expected), moddedEnumeratedFiles(fileList)) {
 					logrus.Warn("chmod() lost some bits and possibly timestamps on symlinks, otherwise we match the source archive")
 				} else {
-					require.Equal(t, expected, fileList, "list of files in context directory for archive %q under topdir %q should match the archived used to populate it", testArchives[i].name, topdir)
+					require.Equalf(t, expected, fileList, "list of files in context directory for archive %q under topdir %q should match the archived used to populate it", testArchives[i].name, topdir)
 				}
 			})
 		}
@@ -662,10 +662,10 @@ func testPut(ctx context.Context, t *testing.T, expectedError error) {
 					}
 					require.Nil(t, err, "unexpected error writing sample file", err)
 					st, err := os.Stat(filepath.Join(tmp, "test"))
-					require.Nilf(t, err, "unexpected error checking permissions of file", err)
-					assert.Equalf(t, stripSetuidBit, st.Mode()&os.ModeSetuid == 0, "setuid bit was not set/stripped correctly")
-					assert.Equalf(t, stripSetgidBit, st.Mode()&os.ModeSetgid == 0, "setgid bit was not set/stripped correctly")
-					assert.Equalf(t, stripStickyBit, st.Mode()&os.ModeSticky == 0, "sticky bit was not set/stripped correctly")
+					require.Nil(t, err, "unexpected error checking permissions of file", err)
+					assert.Equal(t, stripSetuidBit, st.Mode()&os.ModeSetuid == 0, "setuid bit was not set/stripped correctly")
+					assert.Equal(t, stripSetgidBit, st.Mode()&os.ModeSetgid == 0, "setgid bit was not set/stripped correctly")
+					assert.Equal(t, stripStickyBit, st.Mode()&os.ModeSticky == 0, "sticky bit was not set/stripped correctly")
 				})
 			}
 		}
@@ -737,8 +737,8 @@ func testStat(t *testing.T) {
 							matches := 0
 							for _, glob := range st.Globbed {
 								matches++
-								require.Equal(t, st.Glob, glob, "expected entry for %q", st.Glob)
-								require.NotNil(t, st.Results[glob], "%q globbed %q, but there are no results for it", st.Glob, glob)
+								require.Equalf(t, st.Glob, glob, "expected entry for %q", st.Glob)
+								require.NotNilf(t, st.Results[glob], "%q globbed %q, but there are no results for it", st.Glob, glob)
 								toStat := glob
 								if !absolute {
 									toStat = filepath.Join(root, topdir, name)
@@ -753,24 +753,24 @@ func testStat(t *testing.T) {
 										testItem.Size = int64(len(actualContent))
 									}
 									checkStatInfoOwnership(t, result)
-									require.Equal(t, testItem.Size, result.Size, "unexpected size difference for %q", name)
-									require.True(t, result.IsRegular, "expected %q.IsRegular to be true", glob)
-									require.False(t, result.IsDir, "expected %q.IsDir to be false", glob)
-									require.False(t, result.IsSymlink, "expected %q.IsSymlink to be false", glob)
+									require.Equalf(t, testItem.Size, result.Size, "unexpected size difference for %q", name)
+									require.Truef(t, result.IsRegular, "expected %q.IsRegular to be true", glob)
+									require.Falsef(t, result.IsDir, "expected %q.IsDir to be false", glob)
+									require.Falsef(t, result.IsSymlink, "expected %q.IsSymlink to be false", glob)
 								case tar.TypeDir:
-									require.False(t, result.IsRegular, "expected %q.IsRegular to be false", glob)
-									require.True(t, result.IsDir, "expected %q.IsDir to be true", glob)
-									require.False(t, result.IsSymlink, "expected %q.IsSymlink to be false", glob)
+									require.Falsef(t, result.IsRegular, "expected %q.IsRegular to be false", glob)
+									require.Truef(t, result.IsDir, "expected %q.IsDir to be true", glob)
+									require.Falsef(t, result.IsSymlink, "expected %q.IsSymlink to be false", glob)
 								case tar.TypeSymlink:
-									require.True(t, result.IsSymlink, "%q is supposed to be a symbolic link, but is not", name)
-									require.Equal(t, filepath.FromSlash(testItem.Linkname), result.ImmediateTarget, "%q is supposed to point to %q, but points to %q", glob, testItem.Linkname, result.ImmediateTarget)
+									require.Truef(t, result.IsSymlink, "%q is supposed to be a symbolic link, but is not", name)
+									require.Equalf(t, filepath.FromSlash(testItem.Linkname), result.ImmediateTarget, "%q is supposed to point to %q, but points to %q", glob, testItem.Linkname, result.ImmediateTarget)
 								case tar.TypeBlock, tar.TypeChar:
-									require.False(t, result.IsRegular, "%q is a regular file, but is not supposed to be", name)
-									require.False(t, result.IsDir, "%q is a directory, but is not supposed to be", name)
-									require.False(t, result.IsSymlink, "%q is not supposed to be a symbolic link, but appears to be one", name)
+									require.Falsef(t, result.IsRegular, "%q is a regular file, but is not supposed to be", name)
+									require.Falsef(t, result.IsDir, "%q is a directory, but is not supposed to be", name)
+									require.Falsef(t, result.IsSymlink, "%q is not supposed to be a symbolic link, but appears to be one", name)
 								}
 							}
-							require.Equal(t, 1, matches, "non-glob %q matched %d items, not exactly one", name, matches)
+							require.Equalf(t, 1, matches, "non-glob %q matched %d items, not exactly one", name, matches)
 						}
 					})
 				}
@@ -895,7 +895,7 @@ func testGetSingle(ctx context.Context, t *testing.T, expectedError error) {
 												if expectedMode != hdr.Mode && expectedMode&testModeMask == hdr.Mode&testModeMask {
 													logrus.Warnf("chmod() lost some bits: expected 0%o, got 0%o", expectedMode, hdr.Mode)
 												} else {
-													assert.Equal(t, expectedMode, hdr.Mode, "expected item named %q %sto have mode 0%o, got 0%o", hdr.Name, modifier, expectedMode, hdr.Mode)
+													assert.Equalf(t, expectedMode, hdr.Mode, "expected item named %q %sto have mode 0%o, got 0%o", hdr.Name, modifier, expectedMode, hdr.Mode)
 												}
 												if err != nil {
 													break
@@ -1706,7 +1706,7 @@ func testGetMultiple(ctx context.Context, t *testing.T, expectedGetError error)
 					sort.Strings(expectedContents)
 					assert.ErrorIs(t, err, io.EOF, "expected EOF at end of archive")
 					assert.NoErrorf(t, getErr, "unexpected error from Get(%q)", testCase.pattern)
-					assert.Equal(t, expectedContents, actualContents, "Get(%q,excludes=%v) didn't produce the right set of items", testCase.pattern, excludes)
+					assert.Equalf(t, expectedContents, actualContents, "Get(%q,excludes=%v) didn't produce the right set of items", testCase.pattern, excludes)
 
 					expectedSymlinks := testCase.expectedSymlinks
 					if expectedSymlinks == nil {
@@ -2092,7 +2092,7 @@ func TestCleanerSubdirectory(t *testing.T) {
 	for _, testCase := range testCases {
 		t.Run(testCase[0], func(t *testing.T) {
 			cleaner := cleanerReldirectory(filepath.FromSlash(testCase[0]))
-			assert.Equal(t, testCase[1], filepath.ToSlash(cleaner), "expected to get %q, got %q", testCase[1], cleaner)
+			assert.Equalf(t, testCase[1], filepath.ToSlash(cleaner), "expected to get %q, got %q", testCase[1], cleaner)
 		})
 	}
 }
@@ -2116,7 +2116,7 @@ func TestHandleRename(t *testing.T) {
 	for i, testCase := range testCases {
 		t.Run(strconv.Itoa(i), func(t *testing.T) {
 			renamed := handleRename(renames, testCase[0])
-			assert.Equal(t, testCase[1], renamed, "expected to get %q, got %q", testCase[1], renamed)
+			assert.Equalf(t, testCase[1], renamed, "expected to get %q, got %q", testCase[1], renamed)
 		})
 	}
 }
@@ -2426,7 +2426,7 @@ func TestExtendedGlob(t *testing.T) {
 	expected2 = append(expected2, filepath.Join(tmpdir, "d", "d.dat"))
 	matched, err := extendedGlob(filepath.Join(tmpdir, "**", "*.dat"))
 	require.NoError(t, err, "globbing")
-	require.ElementsMatchf(t, expected1, matched, "**/*.dat")
+	require.ElementsMatch(t, expected1, matched, "**/*.dat")
 	matched, err = extendedGlob(filepath.Join(tmpdir, "**", "d", "*.dat"))
 	require.NoError(t, err, "globbing")
 	require.ElementsMatch(t, expected2, matched, "**/d/*.dat")
@@ -2593,7 +2593,7 @@ func testEnsure(t *testing.T) {
 			for _, item := range testCases[i].options.Paths {
 				target := filepath.Join(tmpdir, testCases[i].subdir, item.Path)
 				st, err := os.Stat(target)
-				require.NoError(t, err, "we supposedly created %q", item.Path)
+				require.NoErrorf(t, err, "we supposedly created %q", item.Path)
 				if item.Chmod != nil {
 					assert.Equalf(t, *item.Chmod, st.Mode().Perm(), "permissions look wrong on %q", item.Path)
 				}
@@ -2606,7 +2606,7 @@ func testEnsure(t *testing.T) {
 				if item.ModTime != nil {
 					assert.Equalf(t, item.ModTime.Unix(), st.ModTime().Unix(), "datestamp looks wrong on %q", item.Path)
 				} else {
-					assert.True(t, !testStarted.After(st.ModTime()), "datestamp is too old on %q: %v < %v", st.ModTime(), testStarted)
+					assert.Truef(t, !testStarted.After(st.ModTime()), "datestamp is too old on %q: %v < %v", target, st.ModTime(), testStarted)
 				}
 			}
 		})
@@ -3106,11 +3106,11 @@ func TestCannotChangeMultipleRequestsWithDifferentChroot(t *testing.T) {
 
 	require.NoError(t, encoder.Encode(&req), "failed to send first request to copier")
 	resp := receiveResponse()
-	require.Empty(t, resp.Error, "first request returned an error: %s", resp.Error)
+	require.Emptyf(t, resp.Error, "first request returned an error: %s", resp.Error)
 
 	require.NoError(t, encoder.Encode(&req), "failed to send second request to copier")
 	resp = receiveResponse()
-	require.Empty(t, resp.Error, "second request returned an error: %s", resp.Error)
+	require.Emptyf(t, resp.Error, "second request returned an error: %s", resp.Error)
 
 	require.NoError(t, encoder.Encode(&request{Request: requestQuit}))
 	require.NoError(t, cmd.Wait())
@@ -3253,7 +3253,7 @@ func testPutTimestamp(t *testing.T) {
 		for _, name := range []string{"subdir", "subdir/file.txt"} {
 			info, err := os.Lstat(filepath.Join(root, name))
 			require.NoError(t, err)
-			assert.Equal(t, override.Unix(), info.ModTime().Unix(), "%q should have overridden timestamp", name)
+			assert.Equalf(t, override.Unix(), info.ModTime().Unix(), "%q should have overridden timestamp", name)
 		}
 	})
 
@@ -3269,7 +3269,7 @@ func testPutTimestamp(t *testing.T) {
 		for _, name := range []string{"dest", "dest/nested", "dest/nested/a", "dest/nested/a/b", "dest/nested/a/b/file.txt"} {
 			info, err := os.Lstat(filepath.Join(root, name))
 			require.NoError(t, err)
-			assert.Equal(t, override.Unix(), info.ModTime().Unix(), "%q should have overridden timestamp", name)
+			assert.Equalf(t, override.Unix(), info.ModTime().Unix(), "%q should have overridden timestamp", name)
 		}
 	})
 

copier/xattrs_test.go

@@ -56,7 +56,7 @@ func TestXattrs(t *testing.T) {
 	for attribute, value := range testValues {
 		t.Run(fmt.Sprintf("attribute=%s", attribute), func(t *testing.T) {
 			f, err := os.CreateTemp(tmp, "copier-xattr-test-")
-			if !assert.Nil(t, err, "error creating test file: %v", err) {
+			if !assert.Nilf(t, err, "error creating test file: %v", err) {
 				t.FailNow()
 			}
 			defer os.Remove(f.Name())
@@ -65,19 +65,19 @@ func TestXattrs(t *testing.T) {
 			if errors.Is(err, syscall.ENOTSUP) {
 				t.Skipf("extended attributes not supported on %q, skipping", tmp)
 			}
-			if !assert.Nil(t, err, "error setting attribute on file: %v", err) {
+			if !assert.Nilf(t, err, "error setting attribute on file: %v", err) {
 				t.FailNow()
 			}
 
 			xattrs, err := Lgetxattrs(f.Name())
-			if !assert.Nil(t, err, "error reading attributes of file: %v", err) {
+			if !assert.Nilf(t, err, "error reading attributes of file: %v", err) {
 				t.FailNow()
 			}
 			xvalue, ok := xattrs[attribute]
-			if !assert.True(t, ok, "did not read back attribute %q for file", attribute) {
+			if !assert.Truef(t, ok, "did not read back attribute %q for file", attribute) {
 				t.FailNow()
 			}
-			if !assert.Equal(t, value, xvalue, "read back different value for attribute %q", attribute) {
+			if !assert.Equalf(t, value, xvalue, "read back different value for attribute %q", attribute) {
 				t.FailNow()
 			}
 		})