octoleo/restic
2
2
Fork 0
mirror of https://github.com/octoleo/restic.git synced 2024-11-26 14:56:29 +00:00
Code Issues Releases Wiki Activity

Remove a few unused variables

Browse Source
This commit is contained in:
Michael Eischer 2020-03-06 23:32:12 +01:00
parent 37113282ca
commit 2f8335554c
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/restic/integration_helpers_test.go
View File

@ -55,7 +55,7 @@ func walkDir(dir string) <-chan *dirEntry {
}() }()
// first element is root // first element is root
_ = <-ch <-ch
return ch return ch
} }

4
cmd/restic/integration_test.go
View File

@ -1105,14 +1105,14 @@ func TestRestoreNoMetadataOnIgnoredIntermediateDirs(t *testing.T) {
testRunRestoreIncludes(t, env.gopts, filepath.Join(env.base, "restore0"), snapshotID, []string{"*.ext"}) testRunRestoreIncludes(t, env.gopts, filepath.Join(env.base, "restore0"), snapshotID, []string{"*.ext"})
f1 := filepath.Join(env.base, "restore0", "testdata", "subdir1", "subdir2") f1 := filepath.Join(env.base, "restore0", "testdata", "subdir1", "subdir2")
fi, err := os.Stat(f1) _, err := os.Stat(f1)
rtest.OK(t, err) rtest.OK(t, err)
// restore with filter "*", this should restore meta data on everything. // restore with filter "*", this should restore meta data on everything.
testRunRestoreIncludes(t, env.gopts, filepath.Join(env.base, "restore1"), snapshotID, []string{"*"}) testRunRestoreIncludes(t, env.gopts, filepath.Join(env.base, "restore1"), snapshotID, []string{"*"})
f2 := filepath.Join(env.base, "restore1", "testdata", "subdir1", "subdir2") f2 := filepath.Join(env.base, "restore1", "testdata", "subdir1", "subdir2")
fi, err = os.Stat(f2) fi, err := os.Stat(f2)
rtest.OK(t, err) rtest.OK(t, err)
rtest.Assert(t, fi.ModTime() == time.Unix(0, 0), rtest.Assert(t, fi.ModTime() == time.Unix(0, 0),

6
internal/repository/master_index_test.go
View File

@ -120,7 +120,7 @@ func TestMasterIndex(t *testing.T) {
rtest.Assert(t, !found, "Expected no blobs when fetching with a random id") rtest.Assert(t, !found, "Expected no blobs when fetching with a random id")
blobs = mIdx.Lookup(restic.NewRandomID(), restic.DataBlob) blobs = mIdx.Lookup(restic.NewRandomID(), restic.DataBlob)
rtest.Assert(t, blobs == nil, "Expected no blobs when fetching with a random id") rtest.Assert(t, blobs == nil, "Expected no blobs when fetching with a random id")
size, found = mIdx.LookupSize(restic.NewRandomID(), restic.DataBlob) _, found = mIdx.LookupSize(restic.NewRandomID(), restic.DataBlob)
rtest.Assert(t, !found, "Expected no blobs when fetching with a random id") rtest.Assert(t, !found, "Expected no blobs when fetching with a random id")
// Test Count // Test Count
@ -172,7 +172,7 @@ func TestMasterMergeFinalIndexes(t *testing.T) {
rtest.Equals(t, 1, len(allIndexes)) rtest.Equals(t, 1, len(allIndexes))
blobCount := 0 blobCount := 0
for _ = range mIdx.Each(context.TODO()) { for range mIdx.Each(context.TODO()) {
blobCount++ blobCount++
} }
rtest.Equals(t, 2, blobCount) rtest.Equals(t, 2, blobCount)
@ -207,7 +207,7 @@ func TestMasterMergeFinalIndexes(t *testing.T) {
rtest.Equals(t, []restic.PackedBlob{blob2}, blobs) rtest.Equals(t, []restic.PackedBlob{blob2}, blobs)
blobCount = 0 blobCount = 0
for _ = range mIdx.Each(context.TODO()) { for range mIdx.Each(context.TODO()) {
blobCount++ blobCount++
} }
rtest.Equals(t, 2, blobCount) rtest.Equals(t, 2, blobCount)

2
internal/repository/worker_group.go
View File

@ -11,7 +11,7 @@ import (
// one of the workers, it is returned. FinalFunc is always run, regardless of // one of the workers, it is returned. FinalFunc is always run, regardless of
// any other previous errors. // any other previous errors.
func RunWorkers(ctx context.Context, count int, workerFunc func() error, finalFunc func()) error { func RunWorkers(ctx context.Context, count int, workerFunc func() error, finalFunc func()) error {
wg, ctx := errgroup.WithContext(ctx) wg, _ := errgroup.WithContext(ctx)
// run workers // run workers
for i := 0; i < count; i++ { for i := 0; i < count; i++ {

2
internal/ui/termstatus/status.go
View File

@ -204,7 +204,7 @@ func (t *Terminal) runWithoutStatus(ctx context.Context) {
fmt.Fprintf(os.Stderr, "flush failed: %v\n", err) fmt.Fprintf(os.Stderr, "flush failed: %v\n", err)
} }
case _ = <-t.status: case <-t.status:
// discard status lines // discard status lines
} }
} }