Skip to content

containerztest: remove container during cleanup after stop #5810

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
prathapcv wants to merge 2 commits into
base: main
Choose a base branch
from
Open

containerztest: remove container during cleanup after stop #5810

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
770fa21
containerztest: remove container during cleanup after stop
prathapcv Jul 31, 2026
69c3d0b
containerztest: use status.Code for NotFound checks in Stop cleanup
prathapcv Jul 31, 2026
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
14 changes: 12 additions & 2 deletions internal/containerztest/containerztest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package containerztest

Check failure on line 15 in internal/containerztest/containerztest.go

View workflow job for this annotation

GitHub Actions / Static Analysis 

should have a package comment

import (
"context"
Expand Down Expand Up @@ -242,15 +242,25 @@
t.Helper()
t.Logf("Attempting to stop container %s", instNameToStop)
if err := cli.StopContainer(ctx, instNameToStop, true); err != nil {
s, _ := status.FromError(err)
if s.Code() == codes.NotFound {
if status.Code(err) == codes.NotFound {
t.Logf("StopContainer: Container %s not found (may have already been stopped and removed): %v", instNameToStop, err)
} else {
t.Logf("StopContainer for %s encountered an issue: %v", instNameToStop, err)
}
} else {
t.Logf("Container %s stopped successfully.", instNameToStop)
}

t.Logf("Attempting to remove container %s", instNameToStop)
if err := cli.RemoveContainer(ctx, instNameToStop, true); err != nil {
if status.Code(err) == codes.NotFound {
t.Logf("RemoveContainer: Container %s not found (may have already been removed): %v", instNameToStop, err)
} else {
t.Logf("RemoveContainer for %s encountered an issue: %v", instNameToStop, err)
}
} else {
Comment thread
prathapcv marked this conversation as resolved.
t.Logf("Container %s removed successfully.", instNameToStop)
}
}

// WaitForRunning polls until a container instance is in the RUNNING state.
Expand Down
Loading