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.

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

Jump to bottom

Skip 2nd&3rd runs when all selecting patterns in sle15 #4632

Merged
merged 1 commit into from
Mar 20, 2018
Merged

Skip 2nd&3rd runs when all selecting patterns in sle15 #4632

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/y2logsstep.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ sub workaround_dependency_issues {
sleep 2;
}
}
return 1;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you comment on this change? What does it change/fix?

Copy link
Contributor Author

@jknphy jknphy Mar 20, 2018 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if the function detects the dependency issue returns 1, so we can know that at least there was a conflict. Otherwise returns undef (that is was originally was returning).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's hope for the best then :)

}

# to break dependency issues
Expand Down
25 changes: 16 additions & 9 deletions tests/installation/select_patterns_and_packages.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
use base "y2logsstep";
use strict;
use testapi;
use version_utils 'is_sle';

my $secondrun = 0; # bsc#1029660

Expand Down Expand Up @@ -154,7 +155,7 @@ sub package_action {

sub run {
my ($self) = @_;

my $dep_issue;
$self->gotopatterns;
if (get_var('PATTERNS')) {
my %wanted_patterns;
Expand Down Expand Up @@ -190,8 +191,9 @@ sub run {
};
assert_screen 'current-pattern-selected', 5;
}
$self->workaround_dependency_issues;
# stick to the default patterns
# stick to the default patterns. Check if at least 1 dep. issue was displayed
$dep_issue = $self->workaround_dependency_issues || $dep_issue;

if (get_var('PATTERNS', '') =~ /default/) {
$needs_to_be_selected = $selected;
}
Expand All @@ -204,12 +206,17 @@ sub run {
}
}
$self->package_action;
$secondrun++;
$self->gotopatterns;
$self->package_action;
$secondrun--;
$self->gotopatterns;
$self->package_action('unblock');
if (is_sle('15+') and check_var('PATTERNS', 'all') and $dep_issue) {
record_soft_failure "bsc#1084064 - Cloud patterns conflicts"; # skip second & third runs
}
else {
$secondrun++;
$self->gotopatterns;
$self->package_action;
$secondrun--;
$self->gotopatterns;
$self->package_action('unblock');
}
}

1;
Expand Down