rm-gocheck: run goimports to compile successfully

goimports -w \
-- "./integration-cli/daemon" "./pkg/discovery" "./pkg/discovery/file" "./pkg/discovery/kv" "./pkg/discovery/memory" "./pkg/discovery/nodes" "./integration-cli" \
&& \
 gofmt -w -s \
-- "./integration-cli/daemon" "./pkg/discovery" "./pkg/discovery/file" "./pkg/discovery/kv" "./pkg/discovery/memory" "./pkg/discovery/nodes" "./integration-cli"

Signed-off-by: Tibor Vass <tibor@docker.com>
This commit is contained in:
Tibor Vass 2019-09-09 21:06:12 +00:00
parent eb67bb9fb5
commit 59e55dcdd0
98 changed files with 115 additions and 71 deletions

View file

@ -7,8 +7,8 @@ import (
"runtime"
"strings"
"sync"
"testing"
"github.com/go-check/check"
"gotest.tools/assert"
)

View file

@ -23,7 +23,6 @@ import (
"github.com/docker/docker/internal/test/fixtures/plugin"
"github.com/docker/docker/internal/test/registry"
"github.com/docker/docker/pkg/reexec"
"github.com/go-check/check"
"gotest.tools/assert"
)

View file

@ -3,6 +3,7 @@ package daemon // import "github.com/docker/docker/integration-cli/daemon"
import (
"fmt"
"strings"
"testing"
"time"
"github.com/docker/docker/internal/test/daemon"

View file

@ -4,6 +4,7 @@ import (
"context"
"fmt"
"strings"
"testing"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/filters"

View file

@ -1,8 +1,9 @@
package main
import (
"testing"
"github.com/docker/docker/integration-cli/daemon"
"github.com/go-check/check"
)
func (s *DockerSwarmSuite) getDaemon(c *testing.T, nodeID string) *daemon.Daemon {

View file

@ -10,13 +10,13 @@ import (
"net/http"
"net/http/httputil"
"strings"
"testing"
"time"
"github.com/docker/docker/api/types"
"github.com/docker/docker/client"
"github.com/docker/docker/internal/test/request"
"github.com/docker/docker/pkg/stdcopy"
"github.com/go-check/check"
"github.com/pkg/errors"
"golang.org/x/net/websocket"
"gotest.tools/assert"

View file

@ -11,13 +11,13 @@ import (
"net/http"
"regexp"
"strings"
"testing"
"github.com/docker/docker/api/types"
"github.com/docker/docker/internal/test/fakecontext"
"github.com/docker/docker/internal/test/fakegit"
"github.com/docker/docker/internal/test/fakestorage"
"github.com/docker/docker/internal/test/request"
"github.com/go-check/check"
"gotest.tools/assert"
is "gotest.tools/assert/cmp"
)

View file

@ -4,10 +4,10 @@ package main
import (
"net/http"
"testing"
"github.com/docker/docker/internal/test/fakecontext"
"github.com/docker/docker/internal/test/request"
"github.com/go-check/check"
"gotest.tools/assert"
is "gotest.tools/assert/cmp"
)

View file

@ -14,6 +14,7 @@ import (
"regexp"
"runtime"
"strings"
"testing"
"time"
"github.com/docker/docker/api/types"

View file

@ -8,12 +8,12 @@ import (
"io/ioutil"
"math/rand"
"strings"
"testing"
winio "github.com/Microsoft/go-winio"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/mount"
"github.com/go-check/check"
"gotest.tools/assert"
is "gotest.tools/assert/cmp"
)

View file

@ -8,10 +8,10 @@ import (
"net/http"
"strings"
"sync"
"testing"
"github.com/docker/docker/api/types/versions"
"github.com/docker/docker/internal/test/request"
"github.com/go-check/check"
"gotest.tools/assert"
)

View file

@ -9,6 +9,7 @@ import (
"net/http"
"os"
"strings"
"testing"
"time"
"github.com/docker/docker/api/types"

View file

@ -7,6 +7,7 @@ import (
"runtime"
"strconv"
"strings"
"testing"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/filters"
@ -15,7 +16,6 @@ import (
"github.com/docker/docker/integration-cli/cli/build"
"github.com/docker/docker/internal/test/request"
"github.com/docker/docker/pkg/parsers/kernel"
"github.com/go-check/check"
"gotest.tools/assert"
)

View file

@ -4,11 +4,11 @@ import (
"context"
"encoding/json"
"strings"
"testing"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/versions/v1p20"
"github.com/docker/docker/client"
"github.com/go-check/check"
"gotest.tools/assert"
is "gotest.tools/assert/cmp"
)

View file

@ -10,13 +10,13 @@ import (
"net/http"
"strconv"
"strings"
"testing"
"time"
"github.com/docker/docker/api/types"
"github.com/docker/docker/client"
"github.com/docker/docker/internal/test/request"
"github.com/docker/docker/pkg/stdcopy"
"github.com/go-check/check"
"gotest.tools/assert"
)

View file

@ -7,13 +7,13 @@ import (
"net/http"
"net/url"
"strings"
"testing"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/filters"
"github.com/docker/docker/api/types/network"
"github.com/docker/docker/api/types/versions"
"github.com/docker/docker/internal/test/request"
"github.com/go-check/check"
"gotest.tools/assert"
)

View file

@ -10,13 +10,13 @@ import (
"strconv"
"strings"
"sync"
"testing"
"time"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/versions"
"github.com/docker/docker/client"
"github.com/docker/docker/internal/test/request"
"github.com/go-check/check"
"gotest.tools/assert"
)

View file

@ -3,12 +3,14 @@
package main
import (
"testing"
"time"
"github.com/docker/docker/api/types/swarm"
"github.com/docker/docker/integration-cli/checker"
"github.com/docker/docker/integration-cli/daemon"
"github.com/go-check/check"
"gotest.tools/assert"
)
func (s *DockerSwarmSuite) TestAPISwarmListNodes(c *testing.T) {

View file

@ -7,6 +7,7 @@ import (
"fmt"
"strconv"
"strings"
"testing"
"time"
"github.com/docker/docker/api/types"

View file

@ -12,6 +12,7 @@ import (
"runtime"
"strings"
"sync"
"testing"
"time"
"github.com/cloudflare/cfssl/csr"

View file

@ -7,11 +7,11 @@ import (
"runtime"
"strconv"
"strings"
"testing"
"github.com/docker/docker/api"
"github.com/docker/docker/api/types/versions"
"github.com/docker/docker/internal/test/request"
"github.com/go-check/check"
"gotest.tools/assert"
)

View file

@ -8,10 +8,10 @@ import (
"runtime"
"strings"
"sync"
"testing"
"time"
"github.com/docker/docker/integration-cli/cli"
"github.com/go-check/check"
"gotest.tools/assert"
"gotest.tools/icmd"
)

View file

@ -7,6 +7,7 @@ import (
"io/ioutil"
"os/exec"
"strings"
"testing"
"time"
"github.com/creack/pty"

View file

@ -13,6 +13,7 @@ import (
"runtime"
"strconv"
"strings"
"testing"
"text/template"
"time"

View file

@ -13,9 +13,9 @@ import (
"regexp"
"strings"
"syscall"
"testing"
"time"
"github.com/docker/docker/integration-cli/checker"
"github.com/docker/docker/integration-cli/cli"
"github.com/docker/docker/integration-cli/cli/build"
"github.com/docker/docker/internal/test/fakecontext"

View file

@ -7,6 +7,7 @@ import (
"path/filepath"
"regexp"
"strings"
"testing"
"github.com/docker/distribution/manifest/schema1"
"github.com/docker/distribution/manifest/schema2"

View file

@ -2,11 +2,13 @@ package main
import (
"strings"
"testing"
"github.com/docker/docker/api/types/versions"
"github.com/docker/docker/integration-cli/checker"
"github.com/docker/docker/integration-cli/cli"
"github.com/go-check/check"
"gotest.tools/assert"
)
func (s *DockerSuite) TestCommitAfterContainerIsDone(c *testing.T) {

View file

@ -3,8 +3,8 @@ package main
import (
"os"
"path/filepath"
"testing"
"github.com/docker/docker/integration-cli/checker"
"github.com/go-check/check"
"gotest.tools/assert"
)

View file

@ -9,8 +9,8 @@ import (
"path"
"path/filepath"
"strings"
"testing"
"github.com/go-check/check"
"gotest.tools/assert"
is "gotest.tools/assert/cmp"
"gotest.tools/icmd"

View file

@ -2,8 +2,8 @@ package main
import (
"os"
"testing"
"github.com/docker/docker/integration-cli/checker"
"github.com/go-check/check"
"gotest.tools/assert"
)

View file

@ -8,9 +8,9 @@ import (
"path/filepath"
"strconv"
"strings"
"testing"
"github.com/docker/docker/pkg/system"
"github.com/go-check/check"
"gotest.tools/assert"
)

View file

@ -9,9 +9,9 @@ import (
"path/filepath"
"runtime"
"strings"
"testing"
"github.com/docker/docker/pkg/archive"
"github.com/go-check/check"
"gotest.tools/assert"
)

View file

@ -6,6 +6,7 @@ import (
"os"
"reflect"
"strings"
"testing"
"time"
"github.com/docker/docker/integration-cli/checker"

View file

@ -4,9 +4,9 @@ package main
import (
"strings"
"testing"
"github.com/docker/docker/pkg/mount"
"github.com/go-check/check"
"golang.org/x/sys/unix"
"gotest.tools/assert"
"gotest.tools/icmd"

View file

@ -21,6 +21,7 @@ import (
"strconv"
"strings"
"sync"
"testing"
"time"
"github.com/cloudflare/cfssl/helpers"

View file

@ -11,6 +11,7 @@ import (
"os/exec"
"strconv"
"strings"
"testing"
"time"
"github.com/docker/docker/api/types"
@ -19,7 +20,6 @@ import (
eventstestutils "github.com/docker/docker/daemon/events/testutils"
"github.com/docker/docker/integration-cli/cli"
"github.com/docker/docker/integration-cli/cli/build"
"github.com/go-check/check"
"gotest.tools/assert"
is "gotest.tools/assert/cmp"
"gotest.tools/icmd"

View file

@ -10,12 +10,12 @@ import (
"os"
"os/exec"
"strings"
"testing"
"time"
"unicode"
"github.com/creack/pty"
"github.com/docker/docker/integration-cli/cli/build"
"github.com/go-check/check"
"golang.org/x/sys/unix"
"gotest.tools/assert"
)

View file

@ -11,12 +11,12 @@ import (
"sort"
"strings"
"sync"
"testing"
"time"
"github.com/docker/docker/client"
"github.com/docker/docker/integration-cli/cli"
"github.com/docker/docker/integration-cli/cli/build"
"github.com/go-check/check"
"gotest.tools/assert"
is "gotest.tools/assert/cmp"
"gotest.tools/icmd"

View file

@ -7,10 +7,10 @@ import (
"io"
"os/exec"
"strings"
"testing"
"time"
"github.com/creack/pty"
"github.com/go-check/check"
"gotest.tools/assert"
)

View file

@ -13,6 +13,7 @@ import (
"os/exec"
"path/filepath"
"strings"
"testing"
"time"
"github.com/docker/docker/api/types"

View file

@ -4,12 +4,12 @@ import (
"encoding/json"
"strconv"
"strings"
"testing"
"time"
"github.com/docker/docker/api/types"
"github.com/docker/docker/integration-cli/checker"
"github.com/docker/docker/integration-cli/cli/build"
"github.com/go-check/check"
"gotest.tools/assert"
)
func waitForHealthStatus(c *testing.T, name string, prev string, expected string) {

View file

@ -5,10 +5,12 @@ import (
"regexp"
"strconv"
"strings"
"testing"
"github.com/docker/docker/integration-cli/checker"
"github.com/docker/docker/integration-cli/cli/build"
"github.com/go-check/check"
"gotest.tools/assert"
)
// This is a heisen-test. Because the created timestamp of images and the behavior of

View file

@ -8,6 +8,7 @@ import (
"reflect"
"sort"
"strings"
"testing"
"time"
"github.com/docker/docker/integration-cli/checker"

View file

@ -8,8 +8,8 @@ import (
"os/exec"
"regexp"
"strings"
"testing"
"github.com/docker/docker/integration-cli/checker"
"github.com/docker/docker/integration-cli/cli"
"github.com/go-check/check"
"gotest.tools/assert"

View file

@ -5,6 +5,7 @@ import (
"fmt"
"net"
"strings"
"testing"
"github.com/docker/docker/integration-cli/checker"
"github.com/docker/docker/integration-cli/daemon"

View file

@ -3,8 +3,10 @@
package main
import (
"testing"
"github.com/docker/docker/integration-cli/checker"
"github.com/go-check/check"
"gotest.tools/assert"
)
func (s *DockerSuite) TestInfoSecurityOptions(c *testing.T) {

View file

@ -6,6 +6,7 @@ import (
"os"
"strconv"
"strings"
"testing"
"time"
"github.com/docker/docker/api/types"

View file

@ -6,6 +6,7 @@ import (
"regexp"
"sort"
"strings"
"testing"
"github.com/docker/docker/integration-cli/checker"
"github.com/docker/docker/runconfig"

View file

@ -4,8 +4,8 @@ import (
"bytes"
"os/exec"
"strings"
"testing"
"github.com/go-check/check"
"gotest.tools/assert"
)

View file

@ -8,8 +8,8 @@ import (
"os/exec"
"path/filepath"
"strings"
"testing"
"github.com/go-check/check"
"gotest.tools/assert"
)

View file

@ -3,9 +3,8 @@ package main
import (
"fmt"
"strings"
"testing"
"time"
"github.com/go-check/check"
)
func (s *DockerSuite) BenchmarkLogsCLIRotateFollow(c *testing.B) {

View file

@ -6,11 +6,11 @@ import (
"os/exec"
"regexp"
"strings"
"testing"
"time"
"github.com/docker/docker/integration-cli/cli"
"github.com/docker/docker/pkg/jsonmessage"
"github.com/go-check/check"
"gotest.tools/assert"
"gotest.tools/icmd"
)

View file

@ -2,10 +2,12 @@ package main
import (
"strings"
"testing"
"github.com/docker/docker/integration-cli/checker"
"github.com/docker/docker/runconfig"
"github.com/go-check/check"
"gotest.tools/assert"
)
// GH14530. Validates combinations of --net= with other options

View file

@ -11,6 +11,7 @@ import (
"net/http/httptest"
"os"
"strings"
"testing"
"time"
"github.com/docker/docker/api/types"

View file

@ -3,9 +3,9 @@ package main
import (
"context"
"strings"
"testing"
"github.com/docker/docker/client"
"github.com/go-check/check"
"gotest.tools/assert"
)

View file

@ -9,6 +9,7 @@ import (
"path"
"path/filepath"
"strings"
"testing"
"time"
"github.com/docker/docker/api/types"

View file

@ -7,6 +7,7 @@ import (
"sort"
"strconv"
"strings"
"testing"
"github.com/docker/docker/integration-cli/checker"
"github.com/go-check/check"

View file

@ -3,8 +3,8 @@ package main
import (
"net"
"strings"
"testing"
"github.com/go-check/check"
"gotest.tools/assert"
"gotest.tools/icmd"
)

View file

@ -8,6 +8,7 @@ import (
"path/filepath"
"strconv"
"strings"
"testing"
"time"
"github.com/docker/docker/integration-cli/checker"

View file

@ -5,6 +5,7 @@ import (
"sort"
"strconv"
"strings"
"testing"
"time"
"github.com/docker/docker/api/types/versions"

View file

@ -8,6 +8,7 @@ import (
"path/filepath"
"runtime"
"strings"
"testing"
"github.com/docker/distribution"
"github.com/docker/distribution/manifest"

View file

@ -5,9 +5,9 @@ import (
"regexp"
"strings"
"sync"
"testing"
"time"
"github.com/go-check/check"
"github.com/opencontainers/go-digest"
"gotest.tools/assert"
is "gotest.tools/assert/cmp"

View file

@ -9,10 +9,10 @@ import (
"os"
"strings"
"sync"
"testing"
"github.com/docker/distribution/reference"
"github.com/docker/docker/integration-cli/cli/build"
"github.com/go-check/check"
"gotest.tools/assert"
"gotest.tools/icmd"
)

View file

@ -6,9 +6,9 @@ import (
"net/http"
"os"
"regexp"
"testing"
"github.com/docker/docker/internal/test/registry"
"github.com/go-check/check"
"gotest.tools/assert"
)

View file

@ -4,6 +4,7 @@ import (
"os"
"strconv"
"strings"
"testing"
"time"
"github.com/docker/docker/integration-cli/checker"

View file

@ -3,6 +3,7 @@ package main
import (
"fmt"
"strings"
"testing"
"time"
"github.com/docker/docker/integration-cli/checker"

View file

@ -20,6 +20,7 @@ import (
"strconv"
"strings"
"sync"
"testing"
"time"
"github.com/docker/docker/client"

View file

@ -15,6 +15,7 @@ import (
"strconv"
"strings"
"syscall"
"testing"
"time"
"github.com/creack/pty"

View file

@ -13,6 +13,7 @@ import (
"regexp"
"sort"
"strings"
"testing"
"time"
"github.com/docker/docker/integration-cli/checker"

View file

@ -9,11 +9,11 @@ import (
"os"
"os/exec"
"strings"
"testing"
"time"
"github.com/creack/pty"
"github.com/docker/docker/integration-cli/cli/build"
"github.com/go-check/check"
"gotest.tools/assert"
"gotest.tools/icmd"
)

View file

@ -3,8 +3,8 @@ package main
import (
"fmt"
"strings"
"testing"
"github.com/go-check/check"
"gotest.tools/assert"
)

View file

@ -7,6 +7,7 @@ import (
"fmt"
"path/filepath"
"strings"
"testing"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/mount"

View file

@ -5,6 +5,7 @@ package main
import (
"strconv"
"strings"
"testing"
"github.com/docker/docker/api/types/swarm"
"github.com/docker/docker/daemon/cluster/executor/container"

View file

@ -8,6 +8,7 @@ import (
"io"
"os/exec"
"strings"
"testing"
"time"
"github.com/docker/docker/integration-cli/checker"

View file

@ -5,8 +5,8 @@ package main
import (
"fmt"
"strings"
"testing"
"github.com/go-check/check"
"gotest.tools/assert"
)

View file

@ -9,8 +9,8 @@ import (
"net/url"
"os/exec"
"strings"
"testing"
"github.com/go-check/check"
"gotest.tools/assert"
)

View file

@ -3,6 +3,7 @@ package main
import (
"fmt"
"strings"
"testing"
"time"
"github.com/docker/docker/integration-cli/checker"

View file

@ -5,10 +5,10 @@ import (
"os/exec"
"regexp"
"strings"
"testing"
"time"
"github.com/docker/docker/integration-cli/cli"
"github.com/go-check/check"
"gotest.tools/assert"
is "gotest.tools/assert/cmp"
)

View file

@ -15,6 +15,7 @@ import (
"path/filepath"
"runtime"
"strings"
"testing"
"time"
"github.com/cloudflare/cfssl/helpers"

View file

@ -5,11 +5,11 @@ package main
import (
"encoding/json"
"strings"
"testing"
"time"
"github.com/docker/docker/api/types/swarm"
"github.com/docker/docker/integration-cli/checker"
"github.com/go-check/check"
"gotest.tools/assert"
)

View file

@ -2,8 +2,8 @@ package main
import (
"strings"
"testing"
"github.com/go-check/check"
"gotest.tools/assert"
"gotest.tools/icmd"
)

View file

@ -8,6 +8,7 @@ import (
"fmt"
"os/exec"
"strings"
"testing"
"time"
"github.com/creack/pty"
@ -15,7 +16,6 @@ import (
"github.com/docker/docker/client"
"github.com/docker/docker/internal/test/request"
"github.com/docker/docker/pkg/parsers/kernel"
"github.com/go-check/check"
"gotest.tools/assert"
)

View file

@ -11,8 +11,8 @@ import (
"path/filepath"
"strconv"
"strings"
"testing"
"github.com/docker/docker/integration-cli/checker"
"github.com/docker/docker/pkg/stringid"
"github.com/docker/docker/pkg/system"
"github.com/go-check/check"

View file

@ -5,9 +5,9 @@ import (
"io/ioutil"
"net/http"
"os"
"testing"
"github.com/docker/docker/internal/test/registry"
"github.com/go-check/check"
"gotest.tools/assert"
)

View file

@ -8,6 +8,7 @@ import (
"os/exec"
"path/filepath"
"strings"
"testing"
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/mount"

View file

@ -6,10 +6,10 @@ package main
import (
"net/http"
"strings"
"testing"
"github.com/docker/docker/api/types/versions"
"github.com/docker/docker/internal/test/request"
"github.com/go-check/check"
"gotest.tools/assert"
is "gotest.tools/assert/cmp"
)

View file

@ -4,9 +4,9 @@ package main
import (
"strings"
"testing"
"github.com/docker/docker/internal/test/request"
"github.com/go-check/check"
"gotest.tools/assert"
)

View file

@ -4,11 +4,12 @@ import (
"os/exec"
"runtime"
"strings"
"testing"
"github.com/docker/docker/integration-cli/checker"
"github.com/docker/docker/integration-cli/daemon"
testdaemon "github.com/docker/docker/internal/test/daemon"
"github.com/go-check/check"
"gotest.tools/assert"
)
func init() {

View file

@ -12,6 +12,7 @@ import (
"path/filepath"
"strconv"
"strings"
"testing"
"time"
"github.com/docker/docker/api/types"

View file

@ -8,9 +8,9 @@ import (
"regexp"
"strconv"
"strings"
"testing"
eventstestutils "github.com/docker/docker/daemon/events/testutils"
"github.com/go-check/check"
"github.com/sirupsen/logrus"
"gotest.tools/assert"
)

View file

@ -8,9 +8,9 @@ import (
"path/filepath"
"runtime"
"strings"
"testing"
"github.com/docker/docker/internal/test/fixtures/load"
"github.com/go-check/check"
"gotest.tools/assert"
)

View file

@ -6,9 +6,9 @@ import (
"os/exec"
"path/filepath"
"strings"
"testing"
"github.com/docker/docker/internal/testutil"
"github.com/go-check/check"
"github.com/pkg/errors"
"gotest.tools/icmd"
)

View file

@ -3,7 +3,8 @@ package discovery // import "github.com/docker/docker/pkg/discovery"
import (
"testing"
"github.com/go-check/check"
"github.com/docker/docker/integration-cli/checker"
"gotest.tools/assert"
)
// Hook up gocheck into the "go test" runner.

View file

@ -6,8 +6,7 @@ import (
"testing"
"github.com/docker/docker/pkg/discovery"
"github.com/go-check/check"
"gotest.tools/assert"
)
// Hook up gocheck into the "go test" runner.

View file

@ -1,7 +1,8 @@
package discovery // import "github.com/docker/docker/pkg/discovery"
import (
"github.com/go-check/check"
"testing"
"gotest.tools/assert"
)
func (s *DiscoverySuite) TestGeneratorNotGenerate(c *testing.T) {

View file

@ -11,7 +11,7 @@ import (
"github.com/docker/docker/pkg/discovery"
"github.com/docker/libkv"
"github.com/docker/libkv/store"
"github.com/go-check/check"
"gotest.tools/assert"
)
// Hook up gocheck into the "go test" runner.

View file

@ -4,7 +4,7 @@ import (
"testing"
"github.com/docker/docker/pkg/discovery"
"github.com/go-check/check"
"gotest.tools/assert"
)
// Hook up gocheck into the "go test" runner.

View file

@ -4,8 +4,7 @@ import (
"testing"
"github.com/docker/docker/pkg/discovery"
"github.com/go-check/check"
"gotest.tools/assert"
)
// Hook up gocheck into the "go test" runner.