Skip to content
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.

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

Fix test failures in 0.7.0 on unusual platforms #539

Merged
merged 2 commits into from
Nov 21, 2022
Merged

Conversation

smcv
Copy link
Collaborator

@smcv smcv commented Nov 7, 2022

  • test-run: If bubblewrap is setuid, assert that --size is not allowed

    Previously, this test would have failed for a setuid bubblewrap.

  • test-run: Don't rely on df supporting the --output=size option

    df --output was new in coreutils 8.21 (2013), and non-GNU
    implementations like busybox df don't have it.

    This avoids a test failure in Steam Runtime 1 'scout', which is based
    on Ubuntu 12.04 (2012). It'll also be helpful for anyone maintaining
    an OS with non-GNU shell utilities.

cc @RyuzakiKK @tomsmeding

Previously, this test would have failed for a setuid bubblewrap.

Signed-off-by: Simon McVittie <smcv@collabora.com>
df --output was new in coreutils 8.21 (2013), and non-GNU
implementations like busybox df don't have it.

This avoids a test failure in Steam Runtime 1 'scout', which is based
on Ubuntu 12.04 (2012). It'll also be helpful for anyone maintaining
an OS with non-GNU shell utilities.

Signed-off-by: Simon McVittie <smcv@collabora.com>
@tomsmeding
Copy link
Contributor

Oops... Sorry @smcv for having to fix my work!

@smcv
Copy link
Collaborator Author

smcv commented Nov 21, 2022

This is a contribution by a maintainer, with a positive review from non-maintainer @RyuzakiKK and no objection from other maintainers, so I'm going to land it.

@smcv smcv merged commit bb7ac13 into containers:main Nov 21, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants