rdelaage/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2024-09-30 14:21:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4823 from MichaelEischer/fix-check-output

Browse Source 
Fix mangled check output
This commit is contained in:
Michael Eischer 2024-05-30 15:17:27 +02:00 committed by GitHub
commit cdd210185d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 85 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
cmd/restic/cmd_check.go
View File

@ -18,6 +18,8 @@ import (
"github.com/restic/restic/internal/repository" "github.com/restic/restic/internal/repository"
"github.com/restic/restic/internal/restic" "github.com/restic/restic/internal/restic"
"github.com/restic/restic/internal/ui" "github.com/restic/restic/internal/ui"
"github.com/restic/restic/internal/ui/progress"
"github.com/restic/restic/internal/ui/termstatus"
) )
var cmdCheck = &cobra.Command{ var cmdCheck = &cobra.Command{
@ -37,7 +39,9 @@ Exit status is 0 if the command was successful, and non-zero if there was any er
`, `,
DisableAutoGenTag: true, DisableAutoGenTag: true,
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
return runCheck(cmd.Context(), checkOptions, globalOptions, args) term, cancel := setupTermstatus()
defer cancel()
return runCheck(cmd.Context(), checkOptions, globalOptions, args, term)
}, },
PreRunE: func(_ *cobra.Command, _ []string) error { PreRunE: func(_ *cobra.Command, _ []string) error {
return checkFlags(checkOptions) return checkFlags(checkOptions)
@ -155,7 +159,7 @@ func parsePercentage(s string) (float64, error) {
// - if the user explicitly requested --no-cache, we don't use any cache // - if the user explicitly requested --no-cache, we don't use any cache
// - if the user provides --cache-dir, we use a cache in a temporary sub-directory of the specified directory and the sub-directory is deleted after the check // - if the user provides --cache-dir, we use a cache in a temporary sub-directory of the specified directory and the sub-directory is deleted after the check
// - by default, we use a cache in a temporary directory that is deleted after the check // - by default, we use a cache in a temporary directory that is deleted after the check
func prepareCheckCache(opts CheckOptions, gopts *GlobalOptions) (cleanup func()) { func prepareCheckCache(opts CheckOptions, gopts *GlobalOptions, printer progress.Printer) (cleanup func()) {
cleanup = func() {} cleanup = func() {}
if opts.WithCache { if opts.WithCache {
// use the default cache, no setup needed // use the default cache, no setup needed
@ -182,34 +186,36 @@ func prepareCheckCache(opts CheckOptions, gopts *GlobalOptions) (cleanup func())
tempdir, err := os.MkdirTemp(cachedir, "restic-check-cache-") tempdir, err := os.MkdirTemp(cachedir, "restic-check-cache-")
if err != nil { if err != nil {
// if an error occurs, don't use any cache // if an error occurs, don't use any cache
Warnf("unable to create temporary directory for cache during check, disabling cache: %v\n", err) printer.E("unable to create temporary directory for cache during check, disabling cache: %v\n", err)
gopts.NoCache = true gopts.NoCache = true
return cleanup return cleanup
} }
gopts.CacheDir = tempdir gopts.CacheDir = tempdir
Verbosef("using temporary cache in %v\n", tempdir) printer.P("using temporary cache in %v\n", tempdir)
cleanup = func() { cleanup = func() {
err := fs.RemoveAll(tempdir) err := fs.RemoveAll(tempdir)
if err != nil { if err != nil {
Warnf("error removing temporary cache directory: %v\n", err) printer.E("error removing temporary cache directory: %v\n", err)
} }
} }
return cleanup return cleanup
} }
func runCheck(ctx context.Context, opts CheckOptions, gopts GlobalOptions, args []string) error { func runCheck(ctx context.Context, opts CheckOptions, gopts GlobalOptions, args []string, term *termstatus.Terminal) error {
if len(args) != 0 { if len(args) != 0 {
return errors.Fatal("the check command expects no arguments, only options - please see `restic help check` for usage and flags") return errors.Fatal("the check command expects no arguments, only options - please see `restic help check` for usage and flags")
} }
cleanup := prepareCheckCache(opts, &gopts) printer := newTerminalProgressPrinter(gopts.verbosity, term)
cleanup := prepareCheckCache(opts, &gopts, printer)
defer cleanup() defer cleanup()
if !gopts.NoLock { if !gopts.NoLock {
Verbosef("create exclusive lock for repository\n") printer.P("create exclusive lock for repository\n")
} }
ctx, repo, unlock, err := openWithExclusiveLock(ctx, gopts, gopts.NoLock) ctx, repo, unlock, err := openWithExclusiveLock(ctx, gopts, gopts.NoLock)
if err != nil { if err != nil {
@ -223,8 +229,8 @@ func runCheck(ctx context.Context, opts CheckOptions, gopts GlobalOptions, args
return err return err
} }
Verbosef("load indexes\n") printer.P("load indexes\n")
bar := newIndexProgress(gopts.Quiet, gopts.JSON) bar := newIndexTerminalProgress(gopts.Quiet, gopts.JSON, term)
hints, errs := chkr.LoadIndex(ctx, bar) hints, errs := chkr.LoadIndex(ctx, bar)
if ctx.Err() != nil { if ctx.Err() != nil {
return ctx.Err() return ctx.Err()
@ -237,34 +243,34 @@ func runCheck(ctx context.Context, opts CheckOptions, gopts GlobalOptions, args
for _, hint := range hints { for _, hint := range hints {
switch hint.(type) { switch hint.(type) {
case *checker.ErrDuplicatePacks: case *checker.ErrDuplicatePacks:
Printf("%v\n", hint) term.Print(hint.Error())
suggestIndexRebuild = true suggestIndexRebuild = true
case *checker.ErrOldIndexFormat: case *checker.ErrOldIndexFormat:
Warnf("error: %v\n", hint) printer.E("error: %v\n", hint)
suggestLegacyIndexRebuild = true suggestLegacyIndexRebuild = true
errorsFound = true errorsFound = true
case *checker.ErrMixedPack: case *checker.ErrMixedPack:
Printf("%v\n", hint) term.Print(hint.Error())
mixedFound = true mixedFound = true
default: default:
Warnf("error: %v\n", hint) printer.E("error: %v\n", hint)
errorsFound = true errorsFound = true
} }
} }
if suggestIndexRebuild { if suggestIndexRebuild {
Printf("Duplicate packs are non-critical, you can run `restic repair index' to correct this.\n") term.Print("Duplicate packs are non-critical, you can run `restic repair index' to correct this.\n")
} }
if suggestLegacyIndexRebuild { if suggestLegacyIndexRebuild {
Warnf("Found indexes using the legacy format, you must run `restic repair index' to correct this.\n") printer.E("Found indexes using the legacy format, you must run `restic repair index' to correct this.\n")
} }
if mixedFound { if mixedFound {
Printf("Mixed packs with tree and data blobs are non-critical, you can run `restic prune` to correct this.\n") term.Print("Mixed packs with tree and data blobs are non-critical, you can run `restic prune` to correct this.\n")
} }
if len(errs) > 0 { if len(errs) > 0 {
for _, err := range errs { for _, err := range errs {
Warnf("error: %v\n", err) printer.E("error: %v\n", err)
} }
return errors.Fatal("LoadIndex returned errors") return errors.Fatal("LoadIndex returned errors")
} }
@ -272,36 +278,36 @@ func runCheck(ctx context.Context, opts CheckOptions, gopts GlobalOptions, args
orphanedPacks := 0 orphanedPacks := 0
errChan := make(chan error) errChan := make(chan error)
Verbosef("check all packs\n") printer.P("check all packs\n")
go chkr.Packs(ctx, errChan) go chkr.Packs(ctx, errChan)
for err := range errChan { for err := range errChan {
if checker.IsOrphanedPack(err) { if checker.IsOrphanedPack(err) {
orphanedPacks++ orphanedPacks++
Verbosef("%v\n", err) printer.P("%v\n", err)
} else if err == checker.ErrLegacyLayout { } else if err == checker.ErrLegacyLayout {
Verbosef("repository still uses the S3 legacy layout\nPlease run `restic migrate s3legacy` to correct this.\n") printer.P("repository still uses the S3 legacy layout\nPlease run `restic migrate s3legacy` to correct this.\n")
} else { } else {
errorsFound = true errorsFound = true
Warnf("%v\n", err) printer.E("%v\n", err)
} }
} }
if orphanedPacks > 0 { if orphanedPacks > 0 {
Verbosef("%d additional files were found in the repo, which likely contain duplicate data.\nThis is non-critical, you can run `restic prune` to correct this.\n", orphanedPacks) printer.P("%d additional files were found in the repo, which likely contain duplicate data.\nThis is non-critical, you can run `restic prune` to correct this.\n", orphanedPacks)
} }
if ctx.Err() != nil { if ctx.Err() != nil {
return ctx.Err() return ctx.Err()
} }
Verbosef("check snapshots, trees and blobs\n") printer.P("check snapshots, trees and blobs\n")
errChan = make(chan error) errChan = make(chan error)
var wg sync.WaitGroup var wg sync.WaitGroup
wg.Add(1) wg.Add(1)
go func() { go func() {
defer wg.Done() defer wg.Done()
bar := newProgressMax(!gopts.Quiet, 0, "snapshots") bar := newTerminalProgressMax(!gopts.Quiet, 0, "snapshots", term)
defer bar.Done() defer bar.Done()
chkr.Structure(ctx, bar, errChan) chkr.Structure(ctx, bar, errChan)
}() }()
@ -309,16 +315,12 @@ func runCheck(ctx context.Context, opts CheckOptions, gopts GlobalOptions, args
for err := range errChan { for err := range errChan {
errorsFound = true errorsFound = true
if e, ok := err.(*checker.TreeError); ok { if e, ok := err.(*checker.TreeError); ok {
var clean string printer.E("error for tree %v:\n", e.ID.Str())
if stdoutCanUpdateStatus() {
clean = clearLine(0)
}
Warnf(clean+"error for tree %v:\n", e.ID.Str())
for _, treeErr := range e.Errors { for _, treeErr := range e.Errors {
Warnf(" %v\n", treeErr) printer.E(" %v\n", treeErr)
} }
} else { } else {
Warnf("error: %v\n", err) printer.E("error: %v\n", err)
} }
} }
@ -336,7 +338,7 @@ func runCheck(ctx context.Context, opts CheckOptions, gopts GlobalOptions, args
return err return err
} }
for _, id := range unused { for _, id := range unused {
Verbosef("unused blob %v\n", id) printer.P("unused blob %v\n", id)
errorsFound = true errorsFound = true
} }
} }
@ -344,7 +346,7 @@ func runCheck(ctx context.Context, opts CheckOptions, gopts GlobalOptions, args
doReadData := func(packs map[restic.ID]int64) { doReadData := func(packs map[restic.ID]int64) {
packCount := uint64(len(packs)) packCount := uint64(len(packs))
p := newProgressMax(!gopts.Quiet, packCount, "packs") p := newTerminalProgressMax(!gopts.Quiet, packCount, "packs", term)
errChan := make(chan error) errChan := make(chan error)
go chkr.ReadPacks(ctx, packs, p, errChan) go chkr.ReadPacks(ctx, packs, p, errChan)
@ -353,7 +355,7 @@ func runCheck(ctx context.Context, opts CheckOptions, gopts GlobalOptions, args
for err := range errChan { for err := range errChan {
errorsFound = true errorsFound = true
Warnf("%v\n", err) printer.E("%v\n", err)
if err, ok := err.(*repository.ErrPackData); ok { if err, ok := err.(*repository.ErrPackData); ok {
salvagePacks = append(salvagePacks, err.PackID) salvagePacks = append(salvagePacks, err.PackID)
} }
@ -361,19 +363,19 @@ func runCheck(ctx context.Context, opts CheckOptions, gopts GlobalOptions, args
p.Done() p.Done()
if len(salvagePacks) > 0 { if len(salvagePacks) > 0 {
Warnf("\nThe repository contains pack files with damaged blobs. These blobs must be removed to repair the repository. This can be done using the following commands. Please read the troubleshooting guide at https://restic.readthedocs.io/en/stable/077_troubleshooting.html first.\n\n") printer.E("\nThe repository contains pack files with damaged blobs. These blobs must be removed to repair the repository. This can be done using the following commands. Please read the troubleshooting guide at https://restic.readthedocs.io/en/stable/077_troubleshooting.html first.\n\n")
var strIDs []string var strIDs []string
for _, id := range salvagePacks { for _, id := range salvagePacks {
strIDs = append(strIDs, id.String()) strIDs = append(strIDs, id.String())
} }
Warnf("restic repair packs %v\nrestic repair snapshots --forget\n\n", strings.Join(strIDs, " ")) printer.E("restic repair packs %v\nrestic repair snapshots --forget\n\n", strings.Join(strIDs, " "))
Warnf("Corrupted blobs are either caused by hardware problems or bugs in restic. Please open an issue at https://github.com/restic/restic/issues/new/choose for further troubleshooting!\n") printer.E("Corrupted blobs are either caused by hardware problems or bugs in restic. Please open an issue at https://github.com/restic/restic/issues/new/choose for further troubleshooting!\n")
} }
} }
switch { switch {
case opts.ReadData: case opts.ReadData:
Verbosef("read all data\n") printer.P("read all data\n")
doReadData(selectPacksByBucket(chkr.GetPacks(), 1, 1)) doReadData(selectPacksByBucket(chkr.GetPacks(), 1, 1))
case opts.ReadDataSubset != "": case opts.ReadDataSubset != "":
var packs map[restic.ID]int64 var packs map[restic.ID]int64
@ -383,12 +385,12 @@ func runCheck(ctx context.Context, opts CheckOptions, gopts GlobalOptions, args
totalBuckets := dataSubset[1] totalBuckets := dataSubset[1]
packs = selectPacksByBucket(chkr.GetPacks(), bucket, totalBuckets) packs = selectPacksByBucket(chkr.GetPacks(), bucket, totalBuckets)
packCount := uint64(len(packs)) packCount := uint64(len(packs))
Verbosef("read group #%d of %d data packs (out of total %d packs in %d groups)\n", bucket, packCount, chkr.CountPacks(), totalBuckets) printer.P("read group #%d of %d data packs (out of total %d packs in %d groups)\n", bucket, packCount, chkr.CountPacks(), totalBuckets)
} else if strings.HasSuffix(opts.ReadDataSubset, "%") { } else if strings.HasSuffix(opts.ReadDataSubset, "%") {
percentage, err := parsePercentage(opts.ReadDataSubset) percentage, err := parsePercentage(opts.ReadDataSubset)
if err == nil { if err == nil {
packs = selectRandomPacksByPercentage(chkr.GetPacks(), percentage) packs = selectRandomPacksByPercentage(chkr.GetPacks(), percentage)
Verbosef("read %.1f%% of data packs\n", percentage) printer.P("read %.1f%% of data packs\n", percentage)
} }
} else { } else {
repoSize := int64(0) repoSize := int64(0)
@ -404,7 +406,7 @@ func runCheck(ctx context.Context, opts CheckOptions, gopts GlobalOptions, args
subsetSize = repoSize subsetSize = repoSize
} }
packs = selectRandomPacksByFileSize(chkr.GetPacks(), subsetSize, repoSize) packs = selectRandomPacksByFileSize(chkr.GetPacks(), subsetSize, repoSize)
Verbosef("read %d bytes of data packs\n", subsetSize) printer.P("read %d bytes of data packs\n", subsetSize)
} }
if packs == nil { if packs == nil {
return errors.Fatal("internal error: failed to select packs to check") return errors.Fatal("internal error: failed to select packs to check")
@ -419,7 +421,7 @@ func runCheck(ctx context.Context, opts CheckOptions, gopts GlobalOptions, args
if errorsFound { if errorsFound {
return errors.Fatal("repository contains errors") return errors.Fatal("repository contains errors")
} }
Verbosef("no errors were found\n") printer.P("no errors were found\n")
return nil return nil
} }

8
cmd/restic/cmd_check_integration_test.go
View File

@ -1,10 +1,12 @@
package main package main
import ( import (
"bytes"
"context" "context"
"testing" "testing"
rtest "github.com/restic/restic/internal/test" rtest "github.com/restic/restic/internal/test"
"github.com/restic/restic/internal/ui/termstatus"
) )
func testRunCheck(t testing.TB, gopts GlobalOptions) { func testRunCheck(t testing.TB, gopts GlobalOptions) {
@ -23,12 +25,14 @@ func testRunCheckMustFail(t testing.TB, gopts GlobalOptions) {
} }
func testRunCheckOutput(gopts GlobalOptions, checkUnused bool) (string, error) { func testRunCheckOutput(gopts GlobalOptions, checkUnused bool) (string, error) {
buf, err := withCaptureStdout(func() error { buf := bytes.NewBuffer(nil)
gopts.stdout = buf
err := withTermStatus(gopts, func(ctx context.Context, term *termstatus.Terminal) error {
opts := CheckOptions{ opts := CheckOptions{
ReadData: true, ReadData: true,
CheckUnused: checkUnused, CheckUnused: checkUnused,
} }
return runCheck(context.TODO(), opts, gopts, nil) return runCheck(context.TODO(), opts, gopts, nil, term)
}) })
return buf.String(), err return buf.String(), err
} }

3
cmd/restic/cmd_check_test.go
View File

@ -10,6 +10,7 @@ import (
"github.com/restic/restic/internal/restic" "github.com/restic/restic/internal/restic"
rtest "github.com/restic/restic/internal/test" rtest "github.com/restic/restic/internal/test"
"github.com/restic/restic/internal/ui/progress"
) )
func TestParsePercentage(t *testing.T) { func TestParsePercentage(t *testing.T) {
@ -201,7 +202,7 @@ func TestPrepareCheckCache(t *testing.T) {
rtest.OK(t, err) rtest.OK(t, err)
} }
gopts := GlobalOptions{CacheDir: tmpDirBase} gopts := GlobalOptions{CacheDir: tmpDirBase}
cleanup := prepareCheckCache(testCase.opts, &gopts) cleanup := prepareCheckCache(testCase.opts, &gopts, &progress.NoopPrinter{})
files, err := os.ReadDir(tmpDirBase) files, err := os.ReadDir(tmpDirBase)
rtest.OK(t, err) rtest.OK(t, err)

39
cmd/restic/cmd_migrate.go
View File

@ -5,6 +5,8 @@ import (
"github.com/restic/restic/internal/migrations" "github.com/restic/restic/internal/migrations"
"github.com/restic/restic/internal/restic" "github.com/restic/restic/internal/restic"
"github.com/restic/restic/internal/ui/progress"
"github.com/restic/restic/internal/ui/termstatus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
@ -24,7 +26,9 @@ Exit status is 0 if the command was successful, and non-zero if there was any er
`, `,
DisableAutoGenTag: true, DisableAutoGenTag: true,
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
return runMigrate(cmd.Context(), migrateOptions, globalOptions, args) term, cancel := setupTermstatus()
defer cancel()
return runMigrate(cmd.Context(), migrateOptions, globalOptions, args, term)
}, },
} }
@ -41,8 +45,8 @@ func init() {
f.BoolVarP(&migrateOptions.Force, "force", "f", false, `apply a migration a second time`) f.BoolVarP(&migrateOptions.Force, "force", "f", false, `apply a migration a second time`)
} }
func checkMigrations(ctx context.Context, repo restic.Repository) error { func checkMigrations(ctx context.Context, repo restic.Repository, printer progress.Printer) error {
Printf("available migrations:\n") printer.P("available migrations:\n")
found := false found := false
for _, m := range migrations.All { for _, m := range migrations.All {
@ -52,19 +56,19 @@ func checkMigrations(ctx context.Context, repo restic.Repository) error {
} }
if ok { if ok {
Printf(" %v\t%v\n", m.Name(), m.Desc()) printer.P(" %v\t%v\n", m.Name(), m.Desc())
found = true found = true
} }
} }
if !found { if !found {
Printf("no migrations found\n") printer.P("no migrations found\n")
} }
return nil return nil
} }
func applyMigrations(ctx context.Context, opts MigrateOptions, gopts GlobalOptions, repo restic.Repository, args []string) error { func applyMigrations(ctx context.Context, opts MigrateOptions, gopts GlobalOptions, repo restic.Repository, args []string, term *termstatus.Terminal, printer progress.Printer) error {
var firsterr error var firsterr error
for _, name := range args { for _, name := range args {
for _, m := range migrations.All { for _, m := range migrations.All {
@ -79,36 +83,37 @@ func applyMigrations(ctx context.Context, opts MigrateOptions, gopts GlobalOptio
if reason == "" { if reason == "" {
reason = "check failed" reason = "check failed"
} }
Warnf("migration %v cannot be applied: %v\nIf you want to apply this migration anyway, re-run with option --force\n", m.Name(), reason) printer.E("migration %v cannot be applied: %v\nIf you want to apply this migration anyway, re-run with option --force\n", m.Name(), reason)
continue continue
} }
Warnf("check for migration %v failed, continuing anyway\n", m.Name()) printer.E("check for migration %v failed, continuing anyway\n", m.Name())
} }
if m.RepoCheck() { if m.RepoCheck() {
Printf("checking repository integrity...\n") printer.P("checking repository integrity...\n")
checkOptions := CheckOptions{} checkOptions := CheckOptions{}
checkGopts := gopts checkGopts := gopts
// the repository is already locked // the repository is already locked
checkGopts.NoLock = true checkGopts.NoLock = true
err = runCheck(ctx, checkOptions, checkGopts, []string{})
err = runCheck(ctx, checkOptions, checkGopts, []string{}, term)
if err != nil { if err != nil {
return err return err
} }
} }
Printf("applying migration %v...\n", m.Name()) printer.P("applying migration %v...\n", m.Name())
if err = m.Apply(ctx, repo); err != nil { if err = m.Apply(ctx, repo); err != nil {
Warnf("migration %v failed: %v\n", m.Name(), err) printer.E("migration %v failed: %v\n", m.Name(), err)
if firsterr == nil { if firsterr == nil {
firsterr = err firsterr = err
} }
continue continue
} }
Printf("migration %v: success\n", m.Name()) printer.P("migration %v: success\n", m.Name())
} }
} }
} }
@ -116,7 +121,9 @@ func applyMigrations(ctx context.Context, opts MigrateOptions, gopts GlobalOptio
return firsterr return firsterr
} }
func runMigrate(ctx context.Context, opts MigrateOptions, gopts GlobalOptions, args []string) error { func runMigrate(ctx context.Context, opts MigrateOptions, gopts GlobalOptions, args []string, term *termstatus.Terminal) error {
printer := newTerminalProgressPrinter(gopts.verbosity, term)
ctx, repo, unlock, err := openWithExclusiveLock(ctx, gopts, false) ctx, repo, unlock, err := openWithExclusiveLock(ctx, gopts, false)
if err != nil { if err != nil {
return err return err
@ -124,8 +131,8 @@ func runMigrate(ctx context.Context, opts MigrateOptions, gopts GlobalOptions, a
defer unlock() defer unlock()
if len(args) == 0 { if len(args) == 0 {
return checkMigrations(ctx, repo) return checkMigrations(ctx, repo, printer)
} }
return applyMigrations(ctx, opts, gopts, repo, args) return applyMigrations(ctx, opts, gopts, repo, args, term, printer)
} }

8
cmd/restic/cmd_prune_integration_test.go
View File

@ -111,7 +111,9 @@ func testPrune(t *testing.T, pruneOpts PruneOptions, checkOpts CheckOptions) {
createPrunableRepo(t, env) createPrunableRepo(t, env)
testRunPrune(t, env.gopts, pruneOpts) testRunPrune(t, env.gopts, pruneOpts)
rtest.OK(t, runCheck(context.TODO(), checkOpts, env.gopts, nil)) rtest.OK(t, withTermStatus(env.gopts, func(ctx context.Context, term *termstatus.Terminal) error {
return runCheck(context.TODO(), checkOpts, env.gopts, nil, term)
}))
} }
var pruneDefaultOptions = PruneOptions{MaxUnused: "5%"} var pruneDefaultOptions = PruneOptions{MaxUnused: "5%"}
@ -218,7 +220,9 @@ func testEdgeCaseRepo(t *testing.T, tarfile string, optionsCheck CheckOptions, o
if checkOK { if checkOK {
testRunCheck(t, env.gopts) testRunCheck(t, env.gopts)
} else { } else {
rtest.Assert(t, runCheck(context.TODO(), optionsCheck, env.gopts, nil) != nil, rtest.Assert(t, withTermStatus(env.gopts, func(ctx context.Context, term *termstatus.Terminal) error {
return runCheck(context.TODO(), optionsCheck, env.gopts, nil, term)
}) != nil,
"check should have reported an error") "check should have reported an error")
} }

5
cmd/restic/integration_test.go
View File

@ -87,8 +87,9 @@ func TestListOnce(t *testing.T) {
createPrunableRepo(t, env) createPrunableRepo(t, env)
testRunPrune(t, env.gopts, pruneOpts) testRunPrune(t, env.gopts, pruneOpts)
rtest.OK(t, runCheck(context.TODO(), checkOpts, env.gopts, nil)) rtest.OK(t, withTermStatus(env.gopts, func(ctx context.Context, term *termstatus.Terminal) error {
return runCheck(context.TODO(), checkOpts, env.gopts, nil, term)
}))
rtest.OK(t, withTermStatus(env.gopts, func(ctx context.Context, term *termstatus.Terminal) error { rtest.OK(t, withTermStatus(env.gopts, func(ctx context.Context, term *termstatus.Terminal) error {
return runRebuildIndex(context.TODO(), RepairIndexOptions{}, env.gopts, term) return runRebuildIndex(context.TODO(), RepairIndexOptions{}, env.gopts, term)
})) }))