From 5ecaaea90befb70613a9a37ff124cff62033f48b Mon Sep 17 00:00:00 2001 From: Pauline Middelink Date: Fri, 3 Mar 2017 11:14:39 +0100 Subject: [PATCH] Really use absolute pathnames, not all systems use /. --- src/cmds/restic/integration_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cmds/restic/integration_test.go b/src/cmds/restic/integration_test.go index 0a819e7bb..3c7533ac5 100644 --- a/src/cmds/restic/integration_test.go +++ b/src/cmds/restic/integration_test.go @@ -516,23 +516,23 @@ func TestBackupExclude(t *testing.T) { testRunBackup(t, []string{datadir}, opts, gopts) snapshots, snapshotID := lastSnapshot(snapshots, loadSnapshotMap(t, gopts)) files := testRunLs(t, gopts, snapshotID) - Assert(t, includes(files, filepath.Join("/testdata", "foo.tar.gz")), + Assert(t, includes(files, filepath.Join(string(filepath.Separator), "testdata", "foo.tar.gz")), "expected file %q in first snapshot, but it's not included", "foo.tar.gz") opts.Excludes = []string{"*.tar.gz"} testRunBackup(t, []string{datadir}, opts, gopts) snapshots, snapshotID = lastSnapshot(snapshots, loadSnapshotMap(t, gopts)) files = testRunLs(t, gopts, snapshotID) - Assert(t, !includes(files, filepath.Join("/testdata", "foo.tar.gz")), + Assert(t, !includes(files, filepath.Join(string(filepath.Separator), "testdata", "foo.tar.gz")), "expected file %q not in first snapshot, but it's included", "foo.tar.gz") opts.Excludes = []string{"*.tar.gz", "private/secret"} testRunBackup(t, []string{datadir}, opts, gopts) snapshots, snapshotID = lastSnapshot(snapshots, loadSnapshotMap(t, gopts)) files = testRunLs(t, gopts, snapshotID) - Assert(t, !includes(files, filepath.Join("/testdata", "foo.tar.gz")), + Assert(t, !includes(files, filepath.Join(string(filepath.Separator), "testdata", "foo.tar.gz")), "expected file %q not in first snapshot, but it's included", "foo.tar.gz") - Assert(t, !includes(files, filepath.Join("/testdata", "private", "secret", "passwords.txt")), + Assert(t, !includes(files, filepath.Join(string(filepath.Separator), "testdata", "private", "secret", "passwords.txt")), "expected file %q not in first snapshot, but it's included", "passwords.txt") }) }