Skip to content

test cl #12796

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
copybara-service wants to merge 1 commit into
base: master
Choose a base branch
from
+1 −19
Open

test cl #12796

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 1 addition & 19 deletions test/root/crictl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ var Httpd = SimpleSpec("httpd", "basic/httpd", nil, nil)
// TestCrictlSanity refers to b/112433158.
func TestCrictlSanity(t *testing.T) {
// Setup containerd and crictl.
crictl, cleanup, err := setup(t, false /* enableGrouping */)
crictl, cleanup, err := setup(t, true /* enableGrouping */)
if err != nil {
t.Fatalf("failed to setup crictl: %v", err)
}
Expand All @@ -113,24 +113,6 @@ func TestCrictlSanity(t *testing.T) {
t.Fatalf("failed to get page: %v", err)
}

// Since shim grouping is disabled, there will be one shim process for the
// container and another one for the sandbox.
count, err := countShimProcesses(t, contID)
if err != nil {
t.Fatalf("failed to count shim processes for containerID %s: %v", contID, err)
}
if count != 1 {
t.Errorf("got %d shim processes for containerID %s, want 1", count, contID)
}

count, err = countShimProcesses(t, podID)
if err != nil {
t.Fatalf("failed to count shim processes for podID %s: %v", podID, err)
}
if count != 1 {
t.Errorf("got %d shim processes for podID %s, want 1", count, podID)
}

// Stop everything.
if err := crictl.StopPodAndContainer(podID, contID); err != nil {
t.Fatalf("stop failed: %v", err)
Expand Down
Loading