зеркало из https://github.com/microsoft/docker.git
Merge pull request #30165 from xulike666/fix-typo-6/36
[combined] fix typo
This commit is contained in:
Коммит
de0328560b
|
@ -210,7 +210,7 @@ func TestMountedFalseResponse(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
func TestMountedTrueReponse(t *testing.T) {
|
||||
func TestMountedTrueResponse(t *testing.T) {
|
||||
d := newDriver(t)
|
||||
defer os.RemoveAll(tmp)
|
||||
defer d.Cleanup()
|
||||
|
@ -744,10 +744,10 @@ func BenchmarkConcurrentAccess(b *testing.B) {
|
|||
defer os.RemoveAll(tmp)
|
||||
defer d.Cleanup()
|
||||
|
||||
numConcurent := 256
|
||||
numConcurrent := 256
|
||||
// create a bunch of ids
|
||||
var ids []string
|
||||
for i := 0; i < numConcurent; i++ {
|
||||
for i := 0; i < numConcurrent; i++ {
|
||||
ids = append(ids, stringid.GenerateNonCryptoID())
|
||||
}
|
||||
|
||||
|
@ -762,7 +762,7 @@ func BenchmarkConcurrentAccess(b *testing.B) {
|
|||
parent := ids[1]
|
||||
ids = append(ids[2:])
|
||||
|
||||
chErr := make(chan error, numConcurent)
|
||||
chErr := make(chan error, numConcurrent)
|
||||
var outerGroup sync.WaitGroup
|
||||
outerGroup.Add(len(ids))
|
||||
b.StartTimer()
|
||||
|
|
|
@ -650,7 +650,7 @@ func receiveConfig(s ImageConfigStore, configChan <-chan []byte, errChan <-chan
|
|||
}
|
||||
|
||||
// pullManifestList handles "manifest lists" which point to various
|
||||
// platform-specifc manifests.
|
||||
// platform-specific manifests.
|
||||
func (p *v2Puller) pullManifestList(ctx context.Context, ref reference.Named, mfstList *manifestlist.DeserializedManifestList) (id digest.Digest, manifestListDigest digest.Digest, err error) {
|
||||
manifestListDigest, err = schema2ManifestDigest(ref, mfstList)
|
||||
if err != nil {
|
||||
|
|
|
@ -65,7 +65,7 @@ func (s *DockerSuite) TestExecAPICreateContainerPaused(c *check.C) {
|
|||
}
|
||||
|
||||
func (s *DockerSuite) TestExecAPIStart(c *check.C) {
|
||||
testRequires(c, DaemonIsLinux) // Uses pause/unpause but bits may be salvagable to Windows to Windows CI
|
||||
testRequires(c, DaemonIsLinux) // Uses pause/unpause but bits may be salvageable to Windows to Windows CI
|
||||
dockerCmd(c, "run", "-d", "--name", "test", "busybox", "top")
|
||||
|
||||
id := createExec(c, "test")
|
||||
|
|
|
@ -143,7 +143,7 @@ func (s *DockerSuite) TestExecPausedContainer(c *check.C) {
|
|||
|
||||
dockerCmd(c, "pause", "testing")
|
||||
out, _, err := dockerCmdWithError("exec", "-i", "-t", ContainerID, "echo", "hello")
|
||||
c.Assert(err, checker.NotNil, check.Commentf("container should fail to exec new conmmand if it is paused"))
|
||||
c.Assert(err, checker.NotNil, check.Commentf("container should fail to exec new command if it is paused"))
|
||||
|
||||
expected := ContainerID + " is paused, unpause the container before exec"
|
||||
c.Assert(out, checker.Contains, expected, check.Commentf("container should not exec new command if it is paused"))
|
||||
|
|
|
@ -93,7 +93,7 @@ func (s *DockerSuite) TestHelpTextVerify(c *check.C) {
|
|||
// Create the list of commands we want to test
|
||||
cmdsToTest := []string{}
|
||||
for _, cmd := range helpOut {
|
||||
// Stop on blank line or non-idented line
|
||||
// Stop on blank line or non-indented line
|
||||
if cmd == "" || !unicode.IsSpace(rune(cmd[0])) {
|
||||
break
|
||||
}
|
||||
|
|
|
@ -305,7 +305,7 @@ func (s *DockerSuite) TestInspectNoSizeFlagContainer(c *check.C) {
|
|||
|
||||
formatStr := "--format={{.SizeRw}},{{.SizeRootFs}}"
|
||||
out, _ := dockerCmd(c, "inspect", "--type=container", formatStr, "busybox")
|
||||
c.Assert(strings.TrimSpace(out), check.Equals, "<nil>,<nil>", check.Commentf("Exepcted not to display size info: %s", out))
|
||||
c.Assert(strings.TrimSpace(out), check.Equals, "<nil>,<nil>", check.Commentf("Expected not to display size info: %s", out))
|
||||
}
|
||||
|
||||
func (s *DockerSuite) TestInspectSizeFlagContainer(c *check.C) {
|
||||
|
@ -454,7 +454,7 @@ func (s *DockerSuite) TestInspectUnknownObject(c *check.C) {
|
|||
c.Assert(err.Error(), checker.Contains, "Error: No such object: foobar")
|
||||
}
|
||||
|
||||
func (s *DockerSuite) TestInpectInvalidReference(c *check.C) {
|
||||
func (s *DockerSuite) TestInspectInvalidReference(c *check.C) {
|
||||
// This test should work on both Windows and Linux
|
||||
out, _, err := dockerCmdWithError("inspect", "FooBar")
|
||||
c.Assert(err, checker.NotNil)
|
||||
|
|
|
@ -62,7 +62,7 @@ func registerUserAgentHandler(reg *registry.Mock, result *string) {
|
|||
|
||||
// TestUserAgentPassThrough verifies that when an image is pulled from
|
||||
// a registry, the registry should see a User-Agent string of the form
|
||||
// [docker engine UA] UptreamClientSTREAM-CLIENT([client UA])
|
||||
// [docker engine UA] UpstreamClientSTREAM-CLIENT([client UA])
|
||||
func (s *DockerRegistrySuite) TestUserAgentPassThrough(c *check.C) {
|
||||
var (
|
||||
buildUA string
|
||||
|
|
|
@ -142,7 +142,7 @@ func TestDecompressStreamXz(t *testing.T) {
|
|||
testDecompressStream(t, "xz", "xz -f")
|
||||
}
|
||||
|
||||
func TestCompressStreamXzUnsuported(t *testing.T) {
|
||||
func TestCompressStreamXzUnsupported(t *testing.T) {
|
||||
dest, err := os.Create(tmp + "dest")
|
||||
if err != nil {
|
||||
t.Fatalf("Fail to create the destination file")
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// +build !windows
|
||||
|
||||
// TODO Windows: Some of these tests may be salvagable and portable to Windows.
|
||||
// TODO Windows: Some of these tests may be salvageable and portable to Windows.
|
||||
|
||||
package archive
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@ var basicFunctions = template.FuncMap{
|
|||
"pad": padWithSpace,
|
||||
}
|
||||
|
||||
// Parse creates a new annonymous template with the basic functions
|
||||
// Parse creates a new anonymous template with the basic functions
|
||||
// and parses the given format.
|
||||
func Parse(format string) (*template.Template, error) {
|
||||
return NewParse("", format)
|
||||
|
|
|
@ -31,7 +31,7 @@ type Winsize struct {
|
|||
y uint16
|
||||
}
|
||||
|
||||
// StdStreams returns the standard streams (stdin, stdout, stedrr).
|
||||
// StdStreams returns the standard streams (stdin, stdout, stderr).
|
||||
func StdStreams() (stdIn io.ReadCloser, stdOut, stdErr io.Writer) {
|
||||
return os.Stdin, os.Stdout, os.Stderr
|
||||
}
|
||||
|
|
|
@ -33,7 +33,7 @@ const (
|
|||
// vtInputSupported is true if enableVirtualTerminalInput is supported by the console
|
||||
var vtInputSupported bool
|
||||
|
||||
// StdStreams returns the standard streams (stdin, stdout, stedrr).
|
||||
// StdStreams returns the standard streams (stdin, stdout, stderr).
|
||||
func StdStreams() (stdIn io.ReadCloser, stdOut, stdErr io.Writer) {
|
||||
// Turn on VT handling on all std handles, if possible. This might
|
||||
// fail, in which case we will fall back to terminal emulation.
|
||||
|
|
Загрузка…
Ссылка в новой задаче