From 62df300f726104fb019ff07e64c8f5286aaddc39 Mon Sep 17 00:00:00 2001 From: John Behm Date: Fri, 9 Aug 2024 16:58:34 +0200 Subject: [PATCH] fix windows tests --- backupfs_test.go | 2 +- fs_utils_test.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backupfs_test.go b/backupfs_test.go index 6230be6..1597104 100644 --- a/backupfs_test.go +++ b/backupfs_test.go @@ -505,7 +505,7 @@ func TestBackupFS_JSON(t *testing.T) { } require.Equal(info.IsDir(), newInfo.IsDir()) - require.Equal(info.Name(), newInfo.Name()) + require.Equal(info.Name(), filepath.ToSlash(newInfo.Name())) require.Equal(info.Size(), newInfo.Size()) require.Equal(info.ModTime().UnixNano(), newInfo.ModTime().UnixNano()) require.Equal(info.Mode(), newInfo.Mode()) diff --git a/fs_utils_test.go b/fs_utils_test.go index 078d7d6..a445845 100644 --- a/fs_utils_test.go +++ b/fs_utils_test.go @@ -33,7 +33,7 @@ func TestResolvePathWithFileThatDoesntExist(t *testing.T) { resolvedPath, found, err := resolvePathWithFound(base, symlinkFilePath) require.NoError(t, err) require.False(t, found) - require.Equal(t, originalFilePath, resolvedPath) + require.Equal(t, filepath.FromSlash(originalFilePath), resolvedPath) } func TestResolveCircularSymlinkPath(t *testing.T) { @@ -74,7 +74,7 @@ func TestResolveCircularSymlinkPath(t *testing.T) { resolvedPath, found, err := resolvePathWithFound(base, symlinkFilePath) require.NoError(t, err) require.True(t, found) - require.Equal(t, filePath, resolvedPath) + require.Equal(t, filepath.FromSlash(filePath), resolvedPath) } func TestResolvePathWithAbsoluteSymlink(t *testing.T) { @@ -104,7 +104,7 @@ func TestResolvePathWithAbsoluteSymlink(t *testing.T) { resolvedPath, found, err := resolvePathWithFound(base, symlinkFilePath) require.NoError(t, err) require.True(t, found) - require.Equal(t, originalFilePath, resolvedPath) + require.Equal(t, filepath.FromSlash(originalFilePath), resolvedPath) } func TestResolvePathWithRelativeSymlink(t *testing.T) { @@ -135,7 +135,7 @@ func TestResolvePathWithRelativeSymlink(t *testing.T) { resolvedPath, found, err := resolvePathWithFound(base, symlinkFilePath) require.NoError(t, err) require.True(t, found) - require.Equal(t, originalFilePath, resolvedPath) + require.Equal(t, filepath.FromSlash(originalFilePath), resolvedPath) } func TestResolveFilePathWithRelativeSymlink(t *testing.T) {