Skip to content

Commit

Permalink
Merge pull request #3980 from openqabot/dependency_2021-06-27
Browse files Browse the repository at this point in the history
Dependency cron 2021-06-27
  • Loading branch information
mergify[bot] committed Jun 27, 2021
2 parents eda517e + 3db6ade commit e637e92
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .circleci/autoinst.sha
@@ -1 +1 @@
96b326878a40eadc696594a6e1ed9bba05162caa
5361bf1c6c542b41f7dac978ca59e43e267789b0
2 changes: 1 addition & 1 deletion .circleci/ci-packages.txt
Expand Up @@ -182,7 +182,7 @@ perl-Perl-Critic-1.130
perl-Perl-Critic-Freenode-0.026
perl-Perl-Critic-Pulp-96
perl-PerlIO-Layers-0.012
perl-Perl-Tidy-20210402
perl-Perl-Tidy-20210625
perl-Pod-MinimumVersion-50
perl-Pod-POM-2.01
perl-Pod-Spell-1.20
Expand Down
2 changes: 1 addition & 1 deletion cpanfile
Expand Up @@ -116,7 +116,7 @@ on 'test' => sub {
on 'devel' => sub {
requires 'Devel::Cover';
requires 'Devel::Cover::Report::Codecovbash';
requires 'Perl::Tidy', '== 20210402';
requires 'Perl::Tidy', '== 20210625';

};

Expand Down
2 changes: 1 addition & 1 deletion dependencies.yaml
Expand Up @@ -72,7 +72,7 @@ devel_no_selenium_requires:
xorg-x11-fonts:
perl(Devel::Cover):
perl(Devel::Cover::Report::Codecovbash):
perl(Perl::Tidy): '== 20210402'
perl(Perl::Tidy): '== 20210625'

devel_requires:
'%devel_no_selenium_requires':
Expand Down
6 changes: 2 additions & 4 deletions t/42-df-based-cleanup.t
Expand Up @@ -77,10 +77,8 @@ subtest 'abort early if there is enough free disk space' => sub {

my @check_args = (job => $app->minion->job($job->{id}), setting => 'result_cleanup_max_free_percentage', dir => '');
$job->{state} = undef;
combined_like {
ok !finish_job_if_disk_usage_below_percentage(@check_args, setting => 'foo'), 'invalid setting ignored'
}
qr/Specified value.*will be ignored/, 'warning about invalid setting logged';
combined_like { ok !finish_job_if_disk_usage_below_percentage(@check_args, setting => 'foo'),
'invalid setting ignored' } qr/Specified value.*will be ignored/, 'warning about invalid setting logged';

$df_mock->redefine(df => sub { die 'df failed' });
combined_like { ok !finish_job_if_disk_usage_below_percentage(@check_args), 'invalid df ignored' }
Expand Down

0 comments on commit e637e92

Please sign in to comment.