Skip to content

Adapt btrfs snapshot tests #24913

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
rfan1 wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −1
Open

Adapt btrfs snapshot tests #24913

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
6 changes: 5 additions & 1 deletion lib/btrfs_test.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ use utils 'get_root_console_tty';
use version_utils qw(is_sle is_jeos is_opensuse);
use Utils::Systemd qw(systemctl);
use JSON qw(decode_json);
use Utils::Architectures 'is_aarch64';

our @EXPORT_OK = qw(set_playground_disk cleanup_partition_table);
my $old_snapper = undef;
Expand Down Expand Up @@ -56,6 +57,9 @@ way to get DBus-less environment is to enter rescue.target via systemctl.
sub snapper_nodbus_setup {
my ($self) = @_;
if (script_run('! systemctl is-active dbus')) {
# Wait for a while, see https://progress.opensuse.org/issues/197690
assert_script_run('sync');
sleep 60 if is_aarch64;
script_run('systemctl rescue', 0);
if (!check_screen('emergency-shell', 120)) {
assert_screen('emergency-shell-boo1134533', no_wait => 1);
Expand All @@ -82,7 +86,7 @@ sub snapper_nodbus_restore {
# workaround bsc#1231986 by enabling the tty before switching to default target
script_run('systemctl enable getty@tty6.service') if (is_jeos && is_opensuse);

script_run('systemctl default', timeout => 600);
assert_script_run('systemctl default', timeout => 600);
my $tty = get_root_console_tty;

if (is_sle('<15-SP3') && !defined(my $match = check_screen("tty$tty-selected", 120))) {
Expand Down
Loading