Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apis/opts/config/ulimit_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ func TestUlimitType(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
out := ul.Type()
if !tt.wantErr && !reflect.DeepEqual(out, tt.wantStr) {
t.Errorf("Ulimit.String() = %v, want %v", out, tt.wantStr)
t.Errorf("Ulimit.Type() = %v, want %v", out, tt.wantStr)
}
})
}
Expand Down
2 changes: 1 addition & 1 deletion apis/opts/portbindings.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func ValidatePortBinding(portBindings types.PortMap) error {
for _, pb := range portBindings[port] {
_, err := nat.NewPort(nat.SplitProtoPort(pb.HostPort))
if err != nil {
return fmt.Errorf("invalud port specification: %q, err: %v", pb.HostPort, err)
return fmt.Errorf("invalid port specification: %q, err: %v", pb.HostPort, err)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ctrd/image.go
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ func (c *Client) importImage(ctx context.Context, importer ctrdmetaimages.Import
return imgs, nil
}

// FetchImage fetchs image content from the remote repository.
// FetchImage fetches image content from the remote repository.
func (c *Client) FetchImage(ctx context.Context, ref string, authConfig *types.AuthConfig, stream *jsonstream.JSONStream) (containerd.Image, error) {
wrapperCli, err := c.Get(ctx)
if err != nil {
Expand Down
6 changes: 3 additions & 3 deletions test/cli_create_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func (suite *PouchCreateSuite) TestCreateName(c *check.C) {
c.Assert(res.Combined(), check.Equals, fmt.Sprintf("%s\n", digStr))
}

// TestCreateNameByImageID is to verify the correctness of creating contaier with specified name by image id.
// TestCreateNameByImageID is to verify the correctness of creating container with specified name by image id.
func (suite *PouchCreateSuite) TestCreateNameByImageID(c *check.C) {
name := "create-normal-by-image-id"

Expand Down Expand Up @@ -349,7 +349,7 @@ func (suite *PouchCreateSuite) TestCreateWithUser(c *check.C) {
c.Assert(userConfig, check.Equals, user)
}

// TestCreateWithIntelRdt tests creating container with Intel Rdt.
// TestCreateWithIntelRdt tests creating container with Intel RDT.
func (suite *PouchCreateSuite) TestCreateWithIntelRdt(c *check.C) {
name := "TestCreateWithIntelRdt"
intelRdt := "L3:<cache_id0>=<cbm0>"
Expand Down Expand Up @@ -387,7 +387,7 @@ func (suite *PouchCreateSuite) TestCreateWithAliOSMemoryOptions(c *check.C) {
c.Assert(result[0].HostConfig.ScheLatSwitch, check.Equals, int64(1))
}

// TestCreateWithOOMOption tests creating container with oom options.
// TestCreateWithOOMOption tests creating container with OOM options.
func (suite *PouchCreateSuite) TestCreateWithOOMOption(c *check.C) {
name := "TestCreateWithOOMOption"
oomScore := "100"
Expand Down
2 changes: 1 addition & 1 deletion test/cli_top_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func (suite *PouchTopSuite) TestTopRunningOrPausedContainer(c *check.C) {
c.Fatalf("unexpected output %s expected %s", out, expectString)
}

// Top a paused contaner is valid
// Top a paused container is valid
res = command.PouchRun("pause", name)
res.Assert(c, icmd.Success)

Expand Down