From 744f1c261c57ed68e3bc8d05f4ab58223be24009 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Mon, 5 Aug 2019 17:50:51 +0200
Subject: [PATCH] Remove unused functions, variables, fields

opts/env_test: suppress a linter warning

this one:

> opts/env_test.go:95:4: U1000: field `err` is unused (unused)
> 			err      error
>			^

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 distribution/pull_v2_test.go   | 2 +-
 layer/layer_test.go            | 4 ----
 layer/mounted_layer.go         | 1 -
 opts/env_test.go               | 2 +-
 pkg/mount/mount_unix_test.go   | 2 +-
 pkg/tailfile/tailfile.go       | 1 -
 reference/store_test.go        | 5 +++--
 volume/service/service_test.go | 4 ++--
 8 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/distribution/pull_v2_test.go b/distribution/pull_v2_test.go
index 5a3bf26d29..7e06abb42b 100644
--- a/distribution/pull_v2_test.go
+++ b/distribution/pull_v2_test.go
@@ -180,7 +180,7 @@ func TestValidateManifest(t *testing.T) {
 		t.Fatal("error unmarshaling manifest:", err)
 	}
 
-	verifiedManifest, err = verifySchema1Manifest(&badSignedManifest, expectedDigest)
+	_, err = verifySchema1Manifest(&badSignedManifest, expectedDigest)
 	if err == nil || !strings.HasPrefix(err.Error(), "image verification failed for digest") {
 		t.Fatal("expected validateManifest to fail with digest error")
 	}
diff --git a/layer/layer_test.go b/layer/layer_test.go
index aedff35b05..9199b9c2db 100644
--- a/layer/layer_test.go
+++ b/layer/layer_test.go
@@ -171,10 +171,6 @@ func getCachedLayer(l Layer) *roLayer {
 	return l.(*roLayer)
 }
 
-func getMountLayer(l RWLayer) *mountedLayer {
-	return l.(*referencedRWLayer).mountedLayer
-}
-
 func createMetadata(layers ...Layer) []Metadata {
 	metadata := make([]Metadata, len(layers))
 	for i := range layers {
diff --git a/layer/mounted_layer.go b/layer/mounted_layer.go
index 99bb10d425..f614fd571d 100644
--- a/layer/mounted_layer.go
+++ b/layer/mounted_layer.go
@@ -13,7 +13,6 @@ type mountedLayer struct {
 	mountID    string
 	initID     string
 	parent     *roLayer
-	path       string
 	layerStore *layerStore
 
 	sync.Mutex
diff --git a/opts/env_test.go b/opts/env_test.go
index 1ecf1e2b94..d82495ec21 100644
--- a/opts/env_test.go
+++ b/opts/env_test.go
@@ -96,9 +96,9 @@ func TestValidateEnv(t *testing.T) {
 		}{
 			value:    "PaTh",
 			expected: fmt.Sprintf("PaTh=%v", os.Getenv("PATH")),
+			err:      nil,
 		}
 		testcase = append(testcase, tmp)
-
 	}
 
 	for _, r := range testcase {
diff --git a/pkg/mount/mount_unix_test.go b/pkg/mount/mount_unix_test.go
index befff9d50c..d05e189193 100644
--- a/pkg/mount/mount_unix_test.go
+++ b/pkg/mount/mount_unix_test.go
@@ -122,7 +122,7 @@ func TestMountReadonly(t *testing.T) {
 		}
 	}()
 
-	f, err = os.OpenFile(targetPath, os.O_RDWR, 0777)
+	_, err = os.OpenFile(targetPath, os.O_RDWR, 0777)
 	if err == nil {
 		t.Fatal("Should not be able to open a ro file as rw")
 	}
diff --git a/pkg/tailfile/tailfile.go b/pkg/tailfile/tailfile.go
index c82fe603f6..0d64ec58f2 100644
--- a/pkg/tailfile/tailfile.go
+++ b/pkg/tailfile/tailfile.go
@@ -127,7 +127,6 @@ type scanner struct {
 	delim []byte
 	err   error
 	idx   int
-	done  bool
 }
 
 func (s *scanner) Start(ctx context.Context) int64 {
diff --git a/reference/store_test.go b/reference/store_test.go
index 28c49d83d1..4f2149590e 100644
--- a/reference/store_test.go
+++ b/reference/store_test.go
@@ -110,8 +110,9 @@ func TestAddDeleteGet(t *testing.T) {
 		t.Fatalf("error creating temp file: %v", err)
 	}
 	_, err = jsonFile.Write([]byte(`{}`))
-	jsonFile.Close()
-	defer os.RemoveAll(jsonFile.Name())
+	assert.NilError(t, err)
+	_ = jsonFile.Close()
+	defer func() { _ = os.RemoveAll(jsonFile.Name()) }()
 
 	store, err := NewReferenceStore(jsonFile.Name())
 	if err != nil {
diff --git a/volume/service/service_test.go b/volume/service/service_test.go
index 64a17ad9c7..dd83df3172 100644
--- a/volume/service/service_test.go
+++ b/volume/service/service_test.go
@@ -147,14 +147,14 @@ func TestServiceGet(t *testing.T) {
 	assert.NilError(t, err)
 	assert.Assert(t, is.Len(v.Status, 1), v.Status)
 
-	v, err = service.Get(ctx, "test", opts.WithGetDriver("notarealdriver"))
+	_, err = service.Get(ctx, "test", opts.WithGetDriver("notarealdriver"))
 	assert.Assert(t, errdefs.IsConflict(err), err)
 	v, err = service.Get(ctx, "test", opts.WithGetDriver("d1"))
 	assert.Assert(t, err == nil)
 	assert.Assert(t, is.DeepEqual(created, v))
 
 	assert.Assert(t, ds.Register(testutils.NewFakeDriver("d2"), "d2"))
-	v, err = service.Get(ctx, "test", opts.WithGetDriver("d2"))
+	_, err = service.Get(ctx, "test", opts.WithGetDriver("d2"))
 	assert.Assert(t, errdefs.IsConflict(err), err)
 }