From 38e6d7f7cee16ab1b9c315e6a2d8d3f302d8630e Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Mon, 10 Oct 2016 12:28:49 +0200 Subject: [PATCH] Bug 771617 - Build fails because test test-report-utilities is sensitive to time of day/timezone Previous commit was working with years and monts potentially outside the supported range. --- src/report/report-system/test/test-report-utilities.scm | 9 ++++++--- src/report/standard-reports/test/test-cash-flow.scm | 6 +++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/report/report-system/test/test-report-utilities.scm b/src/report/report-system/test/test-report-utilities.scm index dd061721a3..174f64723b 100644 --- a/src/report/report-system/test/test-report-utilities.scm +++ b/src/report/report-system/test/test-report-utilities.scm @@ -20,10 +20,13 @@ (define (test-account-get-trans-type-splits-interval) (let* ((env (create-test-env)) (ts-now (localtime (current-time))) - (end-date-tp (gnc-dmy2timespec-neutral (tm:mday ts-now) (tm:mon ts-now) (tm:year ts-now))) + (test-day (tm:mday ts-now)) + (test-month (+ 1 (tm:mon ts-now))) + (test-year (+ 1900 (tm:year ts-now))) + (end-date-tp (gnc-dmy2timespec-neutral test-day test-month test-year)) (start-date-tp (NDayDelta end-date-tp 10)) - (q-end-date-tp (gnc-dmy2timespec-end (tm:mday ts-now) (tm:mon ts-now) (tm:year ts-now))) - (q-start-date-tp (gnc-dmy2timespec (tm:mday ts-now) (tm:mon ts-now) (tm:year ts-now))) + (q-end-date-tp (gnc-dmy2timespec-end test-day test-month test-year)) + (q-start-date-tp (gnc-dmy2timespec test-day test-month test-year)) (q-start-date-tp (NDayDelta q-start-date-tp 5))) (let* ((accounts (env-create-account-structure-alist env (list "Assets" diff --git a/src/report/standard-reports/test/test-cash-flow.scm b/src/report/standard-reports/test/test-cash-flow.scm index 74031adedf..0b6c5a8c76 100644 --- a/src/report/standard-reports/test/test-cash-flow.scm +++ b/src/report/standard-reports/test/test-cash-flow.scm @@ -31,7 +31,7 @@ (wallet-account (cdr (assoc "Wallet" account-alist))) (expense-account (cdr (assoc "Expenses" account-alist))) (today (localtime (current-time))) - (to-date-tp (gnc-dmy2timespec-end (tm:mday today) (tm:mon today) (tm:year today))) + (to-date-tp (gnc-dmy2timespec-end (tm:mday today) (+ 1 (tm:mon today)) (+ 1900 (tm:year today)))) (from-date-tp (NDayDelta to-date-tp 1)) (exchange-fn (lambda (currency amount date) amount)) (report-currency (gnc-default-report-currency)) @@ -67,7 +67,7 @@ (wallet-account (cdr (assoc "Wallet" account-alist))) (expense-account (cdr (assoc "Expenses" account-alist))) (today (localtime (current-time))) - (to-date-tp (gnc-dmy2timespec-end (tm:mday today) (tm:mon today) (tm:year today))) + (to-date-tp (gnc-dmy2timespec-end (tm:mday today) (+ 1 (tm:mon today)) (+ 1900 (tm:year today)))) (from-date-tp (NDayDelta to-date-tp 1)) (exchange-fn (lambda (currency amount date) amount)) (report-currency (gnc-default-report-currency)) @@ -99,7 +99,7 @@ (wallet-account (cdr (assoc "Wallet" account-alist))) (expense-account (cdr (assoc "Expenses" account-alist))) (today (localtime (current-time))) - (to-date-tp (gnc-dmy2timespec-end (tm:mday today) (tm:mon today) (tm:year today))) + (to-date-tp (gnc-dmy2timespec-end (tm:mday today) (+ 1 (tm:mon today)) (+ 1900 (tm:year today)))) (from-date-tp (NDayDelta to-date-tp 1)) (exchange-fn (lambda (currency amount date) amount)) (report-currency (gnc-default-report-currency))