Skip to content

Use on_ubuntucore function from checkbox-support snapd_utils helpers (bugfix) #1853

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
fernando79513 merged 2 commits into from
May 28, 2025
Merged

Use on_ubuntucore function from checkbox-support snapd_utils helpers (bugfix) #1853

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d65cddb
Use `on_ubuntucore` function from checkbox-support snapd_utils helpers
pieqq Apr 8, 2025
fafe671
Fix black error
pieqq Apr 8, 2025
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
16 changes: 2 additions & 14 deletions providers/base/bin/removable_storage_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@
from checkbox_support.udev import get_udev_block_devices # noqa: E402
from checkbox_support.udev import get_udev_xhci_devices # noqa: E402

from checkbox_support.snap_utils.system import on_ubuntucore # noqa: E402

Check warning on line 48 in providers/base/bin/removable_storage_test.py

View check run for this annotation

Codecov / codecov/patch

providers/base/bin/removable_storage_test.py#L48 

Added line #L48 was not covered by tests


class ActionTimer:
"""Class to implement a simple timer"""
Expand Down Expand Up @@ -111,20 +113,6 @@
return md5.hexdigest()


def on_ubuntucore():
"""
Check if running from on ubuntu core
"""
snap = os.getenv("SNAP")
if snap:
with open(os.path.join(snap, "meta/snap.yaml")) as f:
for line in f.readlines():
if line == "confinement: classic\n":
return False
return True
return False


class DiskTest:
"""Class to contain various methods for testing removable disks"""

Expand Down
Loading