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

zypper_lifecycle: Add workaround for bsc#1057788 #3678

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 6 additions & 3 deletions tests/console/zypper_lifecycle.pm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# SUSE's openQA tests
#
# Copyright © 2016 SUSE LLC
# Copyright © 2016-2017 SUSE LLC
#
# Copying and distribution of this file, with or without modification,
# are permitted in any medium without royalty provided the copyright
Expand All @@ -14,6 +14,7 @@
use base "consoletest";
use strict;
use testapi;
use utils;


our $date_re = qr/[0-9]{4}-[0-9]{2}-[0-9]{2}/;
Expand Down Expand Up @@ -91,8 +92,10 @@ sub run {
select_console 'user-console';
# verify that package eol defaults to product eol
$output = script_output "zypper lifecycle $package", 300;
die "$package lifecycle entry incorrect:'$output', expected: '/$package-\\S+\\s+$product_eol'"
unless $output =~ /$package(-\S+)?\s+$product_eol/;
unless ($output =~ /$package(-\S+)?\s+$product_eol/) {
return record_soft_failure 'bsc#1057788' if (is_sle && sle_version_at_least('15'));
die "$package lifecycle entry incorrect:'$output', expected: '/$package-\\S+\\s+$product_eol'";
}

# restore original data, if any
select_console 'root-console';
Expand Down