TheArchive/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2025-12-14 02:57:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

always access stdout/stderr via globalOptions

Browse Source
This commit is contained in:
Michael Eischer
2023-05-07 22:21:56 +02:00
parent 4b3a0b4104
commit 7a268e4aba
9 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/restic/cmd_backup_integration_test.go
View File

@@ -24,7 +24,6 @@ func testRunBackupAssumeFailure(t testing.TB, dir string, target []string, opts
term := termstatus.New(gopts.stdout, gopts.stderr, gopts.Quiet)
wg.Go(func() error { term.Run(ctx); return nil })
gopts.stdout = io.Discard
t.Logf("backing up %v in %v", target, dir)
if dir != "" {
cleanup := rtest.Chdir(t, dir)
@@ -371,9 +370,7 @@ func TestBackupErrors(t *testing.T) {
rtest.OK(t, os.Chmod(inaccessibleFile, 0644))
}()
opts := BackupOptions{}
gopts := env.gopts
gopts.stderr = io.Discard
err := testRunBackupAssumeFailure(t, filepath.Dir(env.testdata), []string{"testdata"}, opts, gopts)
err := testRunBackupAssumeFailure(t, filepath.Dir(env.testdata), []string{"testdata"}, opts, env.gopts)
rtest.Assert(t, err != nil, "Assumed failure, but no error occurred.")
rtest.Assert(t, err == ErrInvalidSourceData, "Wrong error returned")
testListSnapshots(t, env.gopts, 1)