Attachment 100336 Details for Bug 24817 – Bug 24817: Replace sleep calls with date setting in test data

[patch] Bug 24817: Replace sleep calls with date setting in test data

Bug-24817-Replace-sleep-calls-with-date-setting-in.patch (text/plain), 2.74 KB, created by Martin Renvoize (ashimema) on 2020-03-09 10:39:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2020-03-09 10:39:33 UTC

Size: 2.74 KB

patch

obsolete

>From 0706922221dcdf9fa8ed7fcf86245c5622f33a3c Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Fri, 6 Mar 2020 14:47:00 +0000
>Subject: [PATCH] Bug 24817: Replace sleep calls with date setting in test data
>
>Signed-off-by: David Nind <david@davidnind.com>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> t/db_dependent/Koha/Cash/Register.t | 16 ++++++----------
> 1 file changed, 6 insertions(+), 10 deletions(-)
>
>diff --git a/t/db_dependent/Koha/Cash/Register.t b/t/db_dependent/Koha/Cash/Register.t
>index e24fb06f1d..dfd1881b82 100644
>--- a/t/db_dependent/Koha/Cash/Register.t
>+++ b/t/db_dependent/Koha/Cash/Register.t
>@@ -203,31 +203,24 @@ subtest 'cashup' => sub {
>     subtest 'outstanding_accountlines' => sub {
>         plan tests => 4;
> 
>-        # add_cashup should not happen simultaneously with any other action
>-        # that results in an accountline attached to the same cash register.
>-        # In testing, we need to sleep for a second after each action that
>-        # adds to the database. (We cannot use Time::Fake as timestamps are
>-        # being added at the DB level, not in perl.
>         my $accountline1 = $builder->build_object(
>             {
>                 class => 'Koha::Account::Lines',
>-                value => { register_id => $register->id },
>+                value => { register_id => $register->id, timestamp => \'NOW() - INTERVAL 5 MINUTE' },
>             }
>         );
>         my $accountline2 = $builder->build_object(
>             {
>                 class => 'Koha::Account::Lines',
>-                value => { register_id => $register->id },
>+                value => { register_id => $register->id, timestamp => \'NOW() - INTERVAL 5 MINUTE'},
>             }
>         );
>-        sleep 1;
> 
>         my $accountlines = $register->outstanding_accountlines;
>         is( $accountlines->count, 2, 'No cashup, all accountlines returned' );
> 
>         my $cashup3 =
>           $register->add_cashup( { manager_id => $patron->id, amount => '2.50' } );
>-        sleep 1;
> 
>         $accountlines = $register->outstanding_accountlines;
>         is( $accountlines->count, 0, 'Cashup added, no accountlines returned' );
>@@ -238,7 +231,10 @@ subtest 'cashup' => sub {
>                 value => { register_id => $register->id },
>             }
>         );
>-        sleep 1;
>+
>+        # Fake the cashup timestamp to make sure it's before the accountline we just added,
>+        # we can't trust that these two actions are more than a second apart in a test
>+        $cashup3->timestamp(\'NOW() - INTERVAL 2 MINUTE')->store;
> 
>         $accountlines = $register->outstanding_accountlines;
>         is( $accountlines->count, 1,
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 24817: 100215 | 100275 | 100303 | 100304 | 100326 | 100327 | 100335 | 100336