Bugzilla – Attachment 100778 Details for
Bug 24881
Circulation.t still fails if tests are ran slowly
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 24881: [19.05.x] Try to fix random failure from Circulation.t
Bug-24881-1905x-Try-to-fix-random-failure-from-Cir.patch (text/plain), 5.63 KB, created by
Jonathan Druart
on 2020-03-16 16:20:07 UTC
(
hide
)
Description:
Bug 24881: [19.05.x] Try to fix random failure from Circulation.t
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2020-03-16 16:20:07 UTC
Size:
5.63 KB
patch
obsolete
>From 6dbb78b2744ec7f3356f7de13c7c9147ca5e609c Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Mon, 16 Mar 2020 17:19:22 +0100 >Subject: [PATCH] Bug 24881: [19.05.x] Try to fix random failure from > Circulation.t > >--- > t/db_dependent/Circulation.t | 32 +++++++++++++++++--------------- > 1 file changed, 17 insertions(+), 15 deletions(-) > >diff --git a/t/db_dependent/Circulation.t b/t/db_dependent/Circulation.t >index 83eee84714..c8d4046b81 100755 >--- a/t/db_dependent/Circulation.t >+++ b/t/db_dependent/Circulation.t >@@ -1805,10 +1805,11 @@ subtest 'AddReturn + suspension_chargeperiod' => sub { > ); > $rule->store(); > >- my $five_days_ago = dt_from_string->subtract( days => 5 ); >+ my $now = dt_from_string; >+ my $five_days_ago = $now->clone->subtract( days => 5 ); > # We want to charge 2 days every day, without grace > # With 5 days of overdue: 5 * Z >- my $expected_expiration = dt_from_string->add( days => ( 5 * 2 ) / 1 ); >+ my $expected_expiration = $now->clone->add( days => ( 5 * 2 ) / 1 ); > test_debarment_on_checkout( > { > item => $item_1, >@@ -1822,7 +1823,7 @@ subtest 'AddReturn + suspension_chargeperiod' => sub { > # We want to charge 2 days every 2 days, without grace > # With 5 days of overdue: (5 * 2) / 2 > $rule->suspension_chargeperiod(2)->store; >- $expected_expiration = dt_from_string->add( days => floor( 5 * 2 ) / 2 ); >+ $expected_expiration = $now->clone->add( days => floor( 5 * 2 ) / 2 ); > test_debarment_on_checkout( > { > item => $item_1, >@@ -1837,7 +1838,7 @@ subtest 'AddReturn + suspension_chargeperiod' => sub { > # With 5 days of overdue: ((5-1) / 3 ) * 2 > $rule->suspension_chargeperiod(3)->store; > $rule->firstremind(1)->store; >- $expected_expiration = dt_from_string->add( days => floor( ( ( 5 - 1 ) / 3 ) * 2 ) ); >+ $expected_expiration = $now->clone->add( days => floor( ( ( 5 - 1 ) / 3 ) * 2 ) ); > test_debarment_on_checkout( > { > item => $item_1, >@@ -1858,7 +1859,7 @@ subtest 'AddReturn + suspension_chargeperiod' => sub { > > # Adding a holiday 2 days ago > my $calendar = C4::Calendar->new(branchcode => $library->{branchcode}); >- my $two_days_ago = dt_from_string->subtract( days => 2 ); >+ my $two_days_ago = $now->clone->subtract( days => 2 ); > $calendar->insert_single_holiday( > day => $two_days_ago->day, > month => $two_days_ago->month, >@@ -1867,7 +1868,7 @@ subtest 'AddReturn + suspension_chargeperiod' => sub { > description => 'holidayDesc 2 days ago' > ); > # With 5 days of overdue, only 4 (x finedays=2) days must charged (one was an holiday) >- $expected_expiration = dt_from_string->add( days => floor( ( ( 5 - 0 - 1 ) / 1 ) * 2 ) ); >+ $expected_expiration = $now->clone->add( days => floor( ( ( 5 - 0 - 1 ) / 1 ) * 2 ) ); > test_debarment_on_checkout( > { > item => $item_1, >@@ -1879,7 +1880,7 @@ subtest 'AddReturn + suspension_chargeperiod' => sub { > ); > > # Adding a holiday 2 days ahead, with finesCalendar=noFinesWhenClosed it should be skipped >- my $two_days_ahead = dt_from_string->add( days => 2 ); >+ my $two_days_ahead = $now->clone->add( days => 2 ); > $calendar->insert_single_holiday( > day => $two_days_ahead->day, > month => $two_days_ahead->month, >@@ -1889,7 +1890,7 @@ subtest 'AddReturn + suspension_chargeperiod' => sub { > ); > > # Same as above, but we should skip D+2 >- $expected_expiration = dt_from_string->add( days => floor( ( ( 5 - 0 - 1 ) / 1 ) * 2 ) + 1 ); >+ $expected_expiration = $now->clone->add( days => floor( ( ( 5 - 0 - 1 ) / 1 ) * 2 ) + 1 ); > test_debarment_on_checkout( > { > item => $item_1, >@@ -1925,8 +1926,8 @@ subtest 'AddReturn + suspension_chargeperiod' => sub { > item => $item_1, > library => $library, > patron => $patron, >- return_date => dt_from_string->add(days => 5), >- expiration_date => dt_from_string->add(days => 5 + (5 * 2 - 1) ), >+ return_date => $now->clone->add(days => 5), >+ expiration_date => $now->clone->add(days => 5 + (5 * 2 - 1) ), > } > ); > }; >@@ -2014,9 +2015,9 @@ subtest 'AddReturn | is_overdue' => sub { > $rule->store(); > > my $now = dt_from_string; >- my $one_day_ago = dt_from_string->subtract( days => 1 ); >- my $five_days_ago = dt_from_string->subtract( days => 5 ); >- my $ten_days_ago = dt_from_string->subtract( days => 10 ); >+ my $one_day_ago = $now->clone->subtract( days => 1 ); >+ my $five_days_ago = $now->clone->subtract( days => 5 ); >+ my $ten_days_ago = $now->clone->subtract( days => 10 ); > $patron = Koha::Patrons->find( $patron->{borrowernumber} ); > > # No return date specified, today will be used => 10 days overdue charged >@@ -2674,8 +2675,9 @@ subtest 'CanBookBeIssued | is_overdue' => sub { > .10, 1 > ); > >- my $five_days_go = output_pref({ dt => dt_from_string->add( days => 5 ), dateonly => 1}); >- my $ten_days_go = output_pref({ dt => dt_from_string->add( days => 10), dateonly => 1 }); >+ my $now = dt_from_string; >+ my $five_days_go = output_pref({ dt => $now->clone->add( days => 5 ), dateonly => 1}); >+ my $ten_days_go = output_pref({ dt => $now->clone->add( days => 10), dateonly => 1 }); > my $library = $builder->build( { source => 'Branch' } ); > my $patron = $builder->build_object( { class => 'Koha::Patrons', value => { categorycode => $patron_category->{categorycode} } } ); > >-- >2.20.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 24881
: 100778 |
100970
|
105169
|
105721