Thanks to visit codestin.com
Credit goes to github.com

Skip to content

test: reduce flakes #4141

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

Merged
openshift-merge-robot merged 2 commits into from
Sep 1, 2020
+4 −6
Merged

test: reduce flakes #4141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc9dd6f
test: deflake stats test
haircommander Aug 31, 2020
525d5b7
sandbox: ignore enoent on shm unmount
haircommander Aug 31, 2020
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
5 changes: 3 additions & 2 deletions internal/lib/sandbox/sandbox.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,8 +409,9 @@ func (s *Sandbox) UnmountShm() error {
return nil
}

// try to unmount, ignoring "not mounted" (EINVAL) error
if err := unix.Unmount(fp, unix.MNT_DETACH); err != nil && err != unix.EINVAL {
// try to unmount, ignoring "not mounted" (EINVAL) error and
// "already unmounted" (ENOENT) error
if err := unix.Unmount(fp, unix.MNT_DETACH); err != nil && err != unix.EINVAL && err != unix.ENOENT {
return errors.Wrapf(err, "unable to unmount %s", fp)
}

Expand Down
5 changes: 1 addition & 4 deletions test/stats.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,12 @@ function teardown() {

@test "container stats" {
# given
python -c 'import json,sys;obj=json.load(sys.stdin);obj["name"] = ["podsandbox1-sleep2"];obj["metadata"]["name"] = "podsandbox1-sleep2"; json.dump(obj, sys.stdout)' \
< "$TESTDATA"/container_sleep.json > "$TESTDIR"/container_sleep2.json

pod_id=$(crictl runp "$TESTDATA"/sandbox_config.json)

ctr1_id=$(crictl create "$pod_id" "$TESTDATA"/container_sleep.json "$TESTDATA"/sandbox_config.json)
crictl start "$ctr1_id"

ctr2_id=$(crictl create "$pod_id" "$TESTDIR"/container_sleep2.json "$TESTDATA"/sandbox_config.json)
ctr2_id=$(crictl create "$pod_id" "$TESTDATA"/container_redis.json "$TESTDATA"/sandbox_config.json)
crictl start "$ctr2_id"

# when
Expand Down