From 09652bf8789142a5a5a1de2d41590300761b4954 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 8 Sep 2017 18:00:14 -0400
Subject: [PATCH] Add ineffassign linter
Also enable GC in linting to reduce memory usage.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
builder/dockerfile/evaluator_test.go | 13 +--
builder/remotecontext/tarsum.go | 7 +-
client/service_create.go | 9 +--
daemon/daemon_unix_test.go | 6 +-
daemon/discovery/discovery_test.go | 115 ++++++++++++---------------
distribution/registry_unit_test.go | 45 -----------
hack/dockerfile/binaries-commits | 2 +-
hack/validate/gometalinter.json | 2 +
image/store_test.go | 4 +-
pkg/archive/archive_test.go | 2 +
pkg/archive/changes_test.go | 4 +
pkg/plugins/discovery_unix_test.go | 3 +
pkg/system/path_windows_test.go | 3 +-
pkg/system/stat_unix_test.go | 7 +-
pkg/tarsum/tarsum_test.go | 27 +++----
pkg/term/ascii_test.go | 46 ++++-------
pkg/term/term_linux_test.go | 3 +
reference/store_test.go | 33 +++-----
18 files changed, 122 insertions(+), 209 deletions(-)
diff --git a/builder/dockerfile/evaluator_test.go b/builder/dockerfile/evaluator_test.go
index 72d7ce10e3..b64e21e625 100644
--- a/builder/dockerfile/evaluator_test.go
+++ b/builder/dockerfile/evaluator_test.go
@@ -9,6 +9,7 @@ import (
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/builder/dockerfile/parser"
"github.com/docker/docker/builder/remotecontext"
+ "github.com/docker/docker/internal/testutil"
"github.com/docker/docker/pkg/archive"
"github.com/docker/docker/pkg/reexec"
)
@@ -197,14 +198,6 @@ func executeTestCase(t *testing.T, testCase dispatchTestCase) {
shlex: shlex,
source: context,
}
- state, err = b.dispatch(opts)
-
- if err == nil {
- t.Fatalf("No error when executing test %s", testCase.name)
- }
-
- if !strings.Contains(err.Error(), testCase.expectedError) {
- t.Fatalf("Wrong error message. Should be \"%s\". Got \"%s\"", testCase.expectedError, err.Error())
- }
-
+ _, err = b.dispatch(opts)
+ testutil.ErrorContains(t, err, testCase.expectedError)
}
diff --git a/builder/remotecontext/tarsum.go b/builder/remotecontext/tarsum.go
index 3ae9d82427..fec5a6184d 100644
--- a/builder/remotecontext/tarsum.go
+++ b/builder/remotecontext/tarsum.go
@@ -149,15 +149,12 @@ func (cs *CachableSource) normalize(path string) (cleanpath, fullpath string, er
// Hash returns a hash for a single file in the source
func (cs *CachableSource) Hash(path string) (string, error) {
n := cs.getRoot()
- sum := ""
// TODO: check this for symlinks
v, ok := n.Get([]byte(path))
if !ok {
- sum = path
- } else {
- sum = v.(*fileInfo).sum
+ return path, nil
}
- return sum, nil
+ return v.(*fileInfo).sum, nil
}
// Root returns a root directory for the source
diff --git a/client/service_create.go b/client/service_create.go
index 1b707d721a..834709d1f3 100644
--- a/client/service_create.go
+++ b/client/service_create.go
@@ -88,13 +88,12 @@ func (cli *Client) ServiceCreate(ctx context.Context, service swarm.ServiceSpec,
func imageDigestAndPlatforms(ctx context.Context, cli DistributionAPIClient, image, encodedAuth string) (string, []swarm.Platform, error) {
distributionInspect, err := cli.DistributionInspect(ctx, image, encodedAuth)
- imageWithDigest := image
var platforms []swarm.Platform
if err != nil {
return "", nil, err
}
- imageWithDigest = imageWithDigestString(image, distributionInspect.Descriptor.Digest)
+ imageWithDigest := imageWithDigestString(image, distributionInspect.Descriptor.Digest)
if len(distributionInspect.Platforms) > 0 {
platforms = make([]swarm.Platform, 0, len(distributionInspect.Platforms))
@@ -105,12 +104,12 @@ func imageDigestAndPlatforms(ctx context.Context, cli DistributionAPIClient, ima
// something like "armv7l" (includes the variant), which causes arm images
// to stop working with swarm mode. This patch removes the architecture
// constraint for arm images to ensure tasks get scheduled.
- arch := strings.ToLower(p.Architecture)
- if arch == "arm" {
+ arch := p.Architecture
+ if strings.ToLower(arch) == "arm" {
arch = ""
}
platforms = append(platforms, swarm.Platform{
- Architecture: p.Architecture,
+ Architecture: arch,
OS: p.OS,
})
}
diff --git a/daemon/daemon_unix_test.go b/daemon/daemon_unix_test.go
index f3a7ce4ae8..2bdbd23290 100644
--- a/daemon/daemon_unix_test.go
+++ b/daemon/daemon_unix_test.go
@@ -17,6 +17,7 @@ import (
"github.com/docker/docker/volume/drivers"
"github.com/docker/docker/volume/local"
"github.com/docker/docker/volume/store"
+ "github.com/stretchr/testify/require"
)
type fakeContainerGetter struct {
@@ -289,13 +290,12 @@ func TestMigratePre17Volumes(t *testing.T) {
containerRoot := filepath.Join(rootDir, "containers")
cid := "1234"
err = os.MkdirAll(filepath.Join(containerRoot, cid), 0755)
+ require.NoError(t, err)
vid := "5678"
vfsPath := filepath.Join(rootDir, "vfs", "dir", vid)
err = os.MkdirAll(vfsPath, 0755)
- if err != nil {
- t.Fatal(err)
- }
+ require.NoError(t, err)
config := []byte(`
{
diff --git a/daemon/discovery/discovery_test.go b/daemon/discovery/discovery_test.go
index f084a649a7..d5c9966a3c 100644
--- a/daemon/discovery/discovery_test.go
+++ b/daemon/discovery/discovery_test.go
@@ -4,92 +4,77 @@ import (
"fmt"
"testing"
"time"
+
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
)
+func TestDiscoveryOptsErrors(t *testing.T) {
+ var testcases = []struct {
+ doc string
+ opts map[string]string
+ }{
+ {
+ doc: "discovery.ttl < discovery.heartbeat",
+ opts: map[string]string{"discovery.heartbeat": "10", "discovery.ttl": "5"},
+ },
+ {
+ doc: "discovery.ttl == discovery.heartbeat",
+ opts: map[string]string{"discovery.heartbeat": "10", "discovery.ttl": "10"},
+ },
+ {
+ doc: "negative discovery.heartbeat",
+ opts: map[string]string{"discovery.heartbeat": "-10", "discovery.ttl": "10"},
+ },
+ {
+ doc: "negative discovery.ttl",
+ opts: map[string]string{"discovery.heartbeat": "10", "discovery.ttl": "-10"},
+ },
+ {
+ doc: "invalid discovery.heartbeat",
+ opts: map[string]string{"discovery.heartbeat": "invalid"},
+ },
+ {
+ doc: "invalid discovery.ttl",
+ opts: map[string]string{"discovery.ttl": "invalid"},
+ },
+ }
+
+ for _, testcase := range testcases {
+ _, _, err := discoveryOpts(testcase.opts)
+ assert.Error(t, err, testcase.doc)
+ }
+}
+
func TestDiscoveryOpts(t *testing.T) {
- clusterOpts := map[string]string{"discovery.heartbeat": "10", "discovery.ttl": "5"}
+ clusterOpts := map[string]string{"discovery.heartbeat": "10", "discovery.ttl": "20"}
heartbeat, ttl, err := discoveryOpts(clusterOpts)
- if err == nil {
- t.Fatal("discovery.ttl < discovery.heartbeat must fail")
- }
-
- clusterOpts = map[string]string{"discovery.heartbeat": "10", "discovery.ttl": "10"}
- heartbeat, ttl, err = discoveryOpts(clusterOpts)
- if err == nil {
- t.Fatal("discovery.ttl == discovery.heartbeat must fail")
- }
-
- clusterOpts = map[string]string{"discovery.heartbeat": "-10", "discovery.ttl": "10"}
- heartbeat, ttl, err = discoveryOpts(clusterOpts)
- if err == nil {
- t.Fatal("negative discovery.heartbeat must fail")
- }
-
- clusterOpts = map[string]string{"discovery.heartbeat": "10", "discovery.ttl": "-10"}
- heartbeat, ttl, err = discoveryOpts(clusterOpts)
- if err == nil {
- t.Fatal("negative discovery.ttl must fail")
- }
-
- clusterOpts = map[string]string{"discovery.heartbeat": "invalid"}
- heartbeat, ttl, err = discoveryOpts(clusterOpts)
- if err == nil {
- t.Fatal("invalid discovery.heartbeat must fail")
- }
-
- clusterOpts = map[string]string{"discovery.ttl": "invalid"}
- heartbeat, ttl, err = discoveryOpts(clusterOpts)
- if err == nil {
- t.Fatal("invalid discovery.ttl must fail")
- }
-
- clusterOpts = map[string]string{"discovery.heartbeat": "10", "discovery.ttl": "20"}
- heartbeat, ttl, err = discoveryOpts(clusterOpts)
- if err != nil {
- t.Fatal(err)
- }
-
- if heartbeat != 10*time.Second {
- t.Fatalf("Heartbeat - Expected : %v, Actual : %v", 10*time.Second, heartbeat)
- }
-
- if ttl != 20*time.Second {
- t.Fatalf("TTL - Expected : %v, Actual : %v", 20*time.Second, ttl)
- }
+ require.NoError(t, err)
+ assert.Equal(t, 10*time.Second, heartbeat)
+ assert.Equal(t, 20*time.Second, ttl)
clusterOpts = map[string]string{"discovery.heartbeat": "10"}
heartbeat, ttl, err = discoveryOpts(clusterOpts)
- if err != nil {
- t.Fatal(err)
- }
-
- if heartbeat != 10*time.Second {
- t.Fatalf("Heartbeat - Expected : %v, Actual : %v", 10*time.Second, heartbeat)
- }
-
- expected := 10 * defaultDiscoveryTTLFactor * time.Second
- if ttl != expected {
- t.Fatalf("TTL - Expected : %v, Actual : %v", expected, ttl)
- }
+ require.NoError(t, err)
+ assert.Equal(t, 10*time.Second, heartbeat)
+ assert.Equal(t, 10*defaultDiscoveryTTLFactor*time.Second, ttl)
clusterOpts = map[string]string{"discovery.ttl": "30"}
heartbeat, ttl, err = discoveryOpts(clusterOpts)
- if err != nil {
- t.Fatal(err)
- }
+ require.NoError(t, err)
if ttl != 30*time.Second {
t.Fatalf("TTL - Expected : %v, Actual : %v", 30*time.Second, ttl)
}
- expected = 30 * time.Second / defaultDiscoveryTTLFactor
+ expected := 30 * time.Second / defaultDiscoveryTTLFactor
if heartbeat != expected {
t.Fatalf("Heartbeat - Expected : %v, Actual : %v", expected, heartbeat)
}
discoveryTTL := fmt.Sprintf("%d", defaultDiscoveryTTLFactor-1)
clusterOpts = map[string]string{"discovery.ttl": discoveryTTL}
- heartbeat, ttl, err = discoveryOpts(clusterOpts)
+ heartbeat, _, err = discoveryOpts(clusterOpts)
if err == nil && heartbeat == 0 {
t.Fatal("discovery.heartbeat must be positive")
}
diff --git a/distribution/registry_unit_test.go b/distribution/registry_unit_test.go
index d6b6ee8832..9653f29c03 100644
--- a/distribution/registry_unit_test.go
+++ b/distribution/registry_unit_test.go
@@ -1,21 +1,15 @@
package distribution
import (
- "fmt"
- "io/ioutil"
"net/http"
"net/http/httptest"
"net/url"
- "os"
- "runtime"
"strings"
"testing"
"github.com/docker/distribution/reference"
"github.com/docker/docker/api/types"
registrytypes "github.com/docker/docker/api/types/registry"
- "github.com/docker/docker/pkg/archive"
- "github.com/docker/docker/pkg/stringid"
"github.com/docker/docker/registry"
"github.com/sirupsen/logrus"
"golang.org/x/net/context"
@@ -42,12 +36,6 @@ func (h *tokenPassThruHandler) ServeHTTP(w http.ResponseWriter, r *http.Request)
}
func testTokenPassThru(t *testing.T, ts *httptest.Server) {
- tmp, err := testDirectory("")
- if err != nil {
- t.Fatal(err)
- }
- defer os.RemoveAll(tmp)
-
uri, err := url.Parse(ts.URL)
if err != nil {
t.Fatalf("could not parse url from test server: %v", err)
@@ -137,36 +125,3 @@ func TestTokenPassThruDifferentHost(t *testing.T) {
t.Fatal("Redirect should not forward Authorization header to another host")
}
}
-
-// testDirectory creates a new temporary directory and returns its path.
-// The contents of directory at path `templateDir` is copied into the
-// new directory.
-func testDirectory(templateDir string) (dir string, err error) {
- testID := stringid.GenerateNonCryptoID()[:4]
- prefix := fmt.Sprintf("docker-test%s-%s-", testID, getCallerName(2))
- if prefix == "" {
- prefix = "docker-test-"
- }
- dir, err = ioutil.TempDir("", prefix)
- if err = os.Remove(dir); err != nil {
- return
- }
- if templateDir != "" {
- if err = archive.NewDefaultArchiver().CopyWithTar(templateDir, dir); err != nil {
- return
- }
- }
- return
-}
-
-// getCallerName introspects the call stack and returns the name of the
-// function `depth` levels down in the stack.
-func getCallerName(depth int) string {
- // Use the caller function name as a prefix.
- // This helps trace temp directories back to their test.
- pc, _, _, _ := runtime.Caller(depth + 1)
- callerLongName := runtime.FuncForPC(pc).Name()
- parts := strings.Split(callerLongName, ".")
- callerShortName := parts[len(parts)-1]
- return callerShortName
-}
diff --git a/hack/dockerfile/binaries-commits b/hack/dockerfile/binaries-commits
index e6eb723c02..3c465a4073 100644
--- a/hack/dockerfile/binaries-commits
+++ b/hack/dockerfile/binaries-commits
@@ -10,4 +10,4 @@ LIBNETWORK_COMMIT=7b2b1feb1de4817d522cc372af149ff48d25028e
VNDR_COMMIT=9909bb2b8a0b7ea464527b376dc50389c90df587
# Linting
-GOMETALINTER_COMMIT=f7b6e55301c9c67035003b7ba7f8a1cde532d338
+GOMETALINTER_COMMIT=5507b26af3204e949ffe50ec08ee73e5847938e1
diff --git a/hack/validate/gometalinter.json b/hack/validate/gometalinter.json
index 2e0a6c2f79..c43ddec892 100644
--- a/hack/validate/gometalinter.json
+++ b/hack/validate/gometalinter.json
@@ -1,6 +1,7 @@
{
"Vendor": true,
"Deadline": "2m",
+ "EnableGC": true,
"Sort": ["linter", "severity", "path"],
"Exclude": [
".*\\.pb\\.go",
@@ -17,6 +18,7 @@
"gofmt",
"goimports",
"golint",
+ "ineffassign",
"interfacer",
"unconvert",
"vet"
diff --git a/image/store_test.go b/image/store_test.go
index e6c1746eff..23a60a98fa 100644
--- a/image/store_test.go
+++ b/image/store_test.go
@@ -41,10 +41,10 @@ func TestRestore(t *testing.T) {
assert.Equal(t, "abc", img1.Comment)
assert.Equal(t, "def", img2.Comment)
- p, err := is.GetParent(ID(id1))
+ _, err = is.GetParent(ID(id1))
testutil.ErrorContains(t, err, "failed to read metadata")
- p, err = is.GetParent(ID(id2))
+ p, err := is.GetParent(ID(id2))
assert.NoError(t, err)
assert.Equal(t, ID(id1), p)
diff --git a/pkg/archive/archive_test.go b/pkg/archive/archive_test.go
index d6be3507b4..20a07fb40d 100644
--- a/pkg/archive/archive_test.go
+++ b/pkg/archive/archive_test.go
@@ -1183,8 +1183,10 @@ func TestUntarInvalidSymlink(t *testing.T) {
func TestTempArchiveCloseMultipleTimes(t *testing.T) {
reader := ioutil.NopCloser(strings.NewReader("hello"))
tempArchive, err := NewTempArchive(reader, "")
+ require.NoError(t, err)
buf := make([]byte, 10)
n, err := tempArchive.Read(buf)
+ require.NoError(t, err)
if n != 5 {
t.Fatalf("Expected to read 5 bytes. Read %d instead", n)
}
diff --git a/pkg/archive/changes_test.go b/pkg/archive/changes_test.go
index 8c14a867ae..86f8ef175a 100644
--- a/pkg/archive/changes_test.go
+++ b/pkg/archive/changes_test.go
@@ -188,6 +188,7 @@ func TestChangesWithChangesGH13590(t *testing.T) {
t.Skip("symlinks on Windows")
}
baseLayer, err := ioutil.TempDir("", "docker-changes-test.")
+ require.NoError(t, err)
defer os.RemoveAll(baseLayer)
dir3 := path.Join(baseLayer, "dir1/dir2/dir3")
@@ -197,6 +198,7 @@ func TestChangesWithChangesGH13590(t *testing.T) {
ioutil.WriteFile(file, []byte("hello"), 0666)
layer, err := ioutil.TempDir("", "docker-changes-test2.")
+ require.NoError(t, err)
defer os.RemoveAll(layer)
// Test creating a new file
@@ -219,6 +221,7 @@ func TestChangesWithChangesGH13590(t *testing.T) {
// Now test changing a file
layer, err = ioutil.TempDir("", "docker-changes-test3.")
+ require.NoError(t, err)
defer os.RemoveAll(layer)
if err := copyDir(baseLayer+"/dir1", layer+"/"); err != nil {
@@ -465,6 +468,7 @@ func TestChangesSizeWithOnlyDeleteChanges(t *testing.T) {
func TestChangesSize(t *testing.T) {
parentPath, err := ioutil.TempDir("", "docker-changes-test")
+ require.NoError(t, err)
defer os.RemoveAll(parentPath)
addition := path.Join(parentPath, "addition")
err = ioutil.WriteFile(addition, []byte{0x01, 0x01, 0x01}, 0744)
diff --git a/pkg/plugins/discovery_unix_test.go b/pkg/plugins/discovery_unix_test.go
index 66f50353c3..e4d156dbdc 100644
--- a/pkg/plugins/discovery_unix_test.go
+++ b/pkg/plugins/discovery_unix_test.go
@@ -10,6 +10,8 @@ import (
"path/filepath"
"reflect"
"testing"
+
+ "github.com/stretchr/testify/require"
)
func TestLocalSocket(t *testing.T) {
@@ -89,6 +91,7 @@ func TestScan(t *testing.T) {
r := newLocalRegistry()
p, err := r.Plugin(name)
+ require.NoError(t, err)
pluginNamesNotEmpty, err := Scan()
if err != nil {
diff --git a/pkg/system/path_windows_test.go b/pkg/system/path_windows_test.go
index eccb26aaea..8e21765a3c 100644
--- a/pkg/system/path_windows_test.go
+++ b/pkg/system/path_windows_test.go
@@ -7,12 +7,13 @@ import "testing"
// TestCheckSystemDriveAndRemoveDriveLetter tests CheckSystemDriveAndRemoveDriveLetter
func TestCheckSystemDriveAndRemoveDriveLetter(t *testing.T) {
// Fails if not C drive.
- path, err := CheckSystemDriveAndRemoveDriveLetter(`d:\`)
+ _, err := CheckSystemDriveAndRemoveDriveLetter(`d:\`)
if err == nil || (err != nil && err.Error() != "The specified path is not on the system drive (C:)") {
t.Fatalf("Expected error for d:")
}
// Single character is unchanged
+ var path string
if path, err = CheckSystemDriveAndRemoveDriveLetter("z"); err != nil {
t.Fatalf("Single character should pass")
}
diff --git a/pkg/system/stat_unix_test.go b/pkg/system/stat_unix_test.go
index dee8d30a19..15c2e273b1 100644
--- a/pkg/system/stat_unix_test.go
+++ b/pkg/system/stat_unix_test.go
@@ -6,6 +6,8 @@ import (
"os"
"syscall"
"testing"
+
+ "github.com/stretchr/testify/require"
)
// TestFromStatT tests fromStatT for a tempfile
@@ -15,11 +17,10 @@ func TestFromStatT(t *testing.T) {
stat := &syscall.Stat_t{}
err := syscall.Lstat(file, stat)
+ require.NoError(t, err)
s, err := fromStatT(stat)
- if err != nil {
- t.Fatal(err)
- }
+ require.NoError(t, err)
if stat.Mode != s.Mode() {
t.Fatal("got invalid mode")
diff --git a/pkg/tarsum/tarsum_test.go b/pkg/tarsum/tarsum_test.go
index 86df0e2b89..05f00d36af 100644
--- a/pkg/tarsum/tarsum_test.go
+++ b/pkg/tarsum/tarsum_test.go
@@ -16,6 +16,9 @@ import (
"os"
"strings"
"testing"
+
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
)
type testLayer struct {
@@ -222,17 +225,13 @@ func TestNewTarSumForLabel(t *testing.T) {
func TestEmptyTar(t *testing.T) {
// Test without gzip.
ts, err := emptyTarSum(false)
- if err != nil {
- t.Fatal(err)
- }
+ require.NoError(t, err)
zeroBlock := make([]byte, 1024)
buf := new(bytes.Buffer)
n, err := io.Copy(buf, ts)
- if err != nil {
- t.Fatal(err)
- }
+ require.NoError(t, err)
if n != int64(len(zeroBlock)) || !bytes.Equal(buf.Bytes(), zeroBlock) {
t.Fatalf("tarSum did not write the correct number of zeroed bytes: %d", n)
@@ -247,19 +246,16 @@ func TestEmptyTar(t *testing.T) {
// Test with gzip.
ts, err = emptyTarSum(true)
- if err != nil {
- t.Fatal(err)
- }
+ require.NoError(t, err)
buf.Reset()
- n, err = io.Copy(buf, ts)
- if err != nil {
- t.Fatal(err)
- }
+ _, err = io.Copy(buf, ts)
+ require.NoError(t, err)
bufgz := new(bytes.Buffer)
gz := gzip.NewWriter(bufgz)
n, err = io.Copy(gz, bytes.NewBuffer(zeroBlock))
+ require.NoError(t, err)
gz.Close()
gzBytes := bufgz.Bytes()
@@ -279,10 +275,7 @@ func TestEmptyTar(t *testing.T) {
}
resultSum = ts.Sum(nil)
-
- if resultSum != expectedSum {
- t.Fatalf("expected [%s] but got [%s]", expectedSum, resultSum)
- }
+ assert.Equal(t, expectedSum, resultSum)
}
var (
diff --git a/pkg/term/ascii_test.go b/pkg/term/ascii_test.go
index 4a1e7f302c..5078cb7075 100644
--- a/pkg/term/ascii_test.go
+++ b/pkg/term/ascii_test.go
@@ -1,43 +1,25 @@
package term
-import "testing"
+import (
+ "testing"
+
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
+)
func TestToBytes(t *testing.T) {
codes, err := ToBytes("ctrl-a,a")
- if err != nil {
- t.Fatal(err)
- }
- if len(codes) != 2 {
- t.Fatalf("Expected 2 codes, got %d", len(codes))
- }
- if codes[0] != 1 || codes[1] != 97 {
- t.Fatalf("Expected '1' '97', got '%d' '%d'", codes[0], codes[1])
- }
+ require.NoError(t, err)
+ assert.Equal(t, []byte{1, 97}, codes)
- codes, err = ToBytes("shift-z")
- if err == nil {
- t.Fatalf("Expected error, got none")
- }
+ _, err = ToBytes("shift-z")
+ assert.Error(t, err)
codes, err = ToBytes("ctrl-@,ctrl-[,~,ctrl-o")
- if err != nil {
- t.Fatal(err)
- }
- if len(codes) != 4 {
- t.Fatalf("Expected 4 codes, got %d", len(codes))
- }
- if codes[0] != 0 || codes[1] != 27 || codes[2] != 126 || codes[3] != 15 {
- t.Fatalf("Expected '0' '27' '126', '15', got '%d' '%d' '%d' '%d'", codes[0], codes[1], codes[2], codes[3])
- }
+ require.NoError(t, err)
+ assert.Equal(t, []byte{0, 27, 126, 15}, codes)
codes, err = ToBytes("DEL,+")
- if err != nil {
- t.Fatal(err)
- }
- if len(codes) != 2 {
- t.Fatalf("Expected 2 codes, got %d", len(codes))
- }
- if codes[0] != 127 || codes[1] != 43 {
- t.Fatalf("Expected '127 '43'', got '%d' '%d'", codes[0], codes[1])
- }
+ require.NoError(t, err)
+ assert.Equal(t, []byte{127, 43}, codes)
}
diff --git a/pkg/term/term_linux_test.go b/pkg/term/term_linux_test.go
index f907ff53a0..0bb6f1c95f 100644
--- a/pkg/term/term_linux_test.go
+++ b/pkg/term/term_linux_test.go
@@ -68,6 +68,7 @@ func TestGetFdInfo(t *testing.T) {
require.Equal(t, inFd, tty.Fd())
require.Equal(t, isTerminal, true)
tmpFile, err := newTempFile()
+ require.NoError(t, err)
defer tmpFile.Close()
inFd, isTerminal = GetFdInfo(tmpFile)
require.Equal(t, inFd, tmpFile.Fd())
@@ -81,6 +82,7 @@ func TestIsTerminal(t *testing.T) {
isTerminal := IsTerminal(tty.Fd())
require.Equal(t, isTerminal, true)
tmpFile, err := newTempFile()
+ require.NoError(t, err)
defer tmpFile.Close()
isTerminal = IsTerminal(tmpFile.Fd())
require.Equal(t, isTerminal, false)
@@ -94,6 +96,7 @@ func TestSaveState(t *testing.T) {
require.NoError(t, err)
require.NotNil(t, state)
tty, err = newTtyForTest(t)
+ require.NoError(t, err)
defer tty.Close()
err = RestoreTerminal(tty.Fd(), state)
require.NoError(t, err)
diff --git a/reference/store_test.go b/reference/store_test.go
index 8f0ff6304e..59567b5f63 100644
--- a/reference/store_test.go
+++ b/reference/store_test.go
@@ -9,7 +9,9 @@ import (
"testing"
"github.com/docker/distribution/reference"
- "github.com/opencontainers/go-digest"
+ digest "github.com/opencontainers/go-digest"
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
)
var (
@@ -62,10 +64,10 @@ func TestLoad(t *testing.T) {
func TestSave(t *testing.T) {
jsonFile, err := ioutil.TempFile("", "tag-store-test")
- if err != nil {
- t.Fatalf("error creating temp file: %v", err)
- }
+ require.NoError(t, err)
+
_, err = jsonFile.Write([]byte(`{}`))
+ require.NoError(t, err)
jsonFile.Close()
defer os.RemoveAll(jsonFile.Name())
@@ -326,32 +328,23 @@ func TestAddDeleteGet(t *testing.T) {
func TestInvalidTags(t *testing.T) {
tmpDir, err := ioutil.TempDir("", "tag-store-test")
+ require.NoError(t, err)
defer os.RemoveAll(tmpDir)
store, err := NewReferenceStore(filepath.Join(tmpDir, "repositories.json"))
- if err != nil {
- t.Fatalf("error creating tag store: %v", err)
- }
+ require.NoError(t, err)
id := digest.Digest("sha256:470022b8af682154f57a2163d030eb369549549cba00edc69e1b99b46bb924d6")
// sha256 as repo name
ref, err := reference.ParseNormalizedNamed("sha256:abc")
- if err != nil {
- t.Fatal(err)
- }
+ require.NoError(t, err)
err = store.AddTag(ref, id, true)
- if err == nil {
- t.Fatalf("expected setting tag %q to fail", ref)
- }
+ assert.Error(t, err)
// setting digest as a tag
ref, err = reference.ParseNormalizedNamed("registry@sha256:367eb40fd0330a7e464777121e39d2f5b3e8e23a1e159342e53ab05c9e4d94e6")
- if err != nil {
- t.Fatal(err)
- }
- err = store.AddTag(ref, id, true)
- if err == nil {
- t.Fatalf("expected setting tag %q to fail", ref)
- }
+ require.NoError(t, err)
+ err = store.AddTag(ref, id, true)
+ assert.Error(t, err)
}