gnucash master: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Mon Oct 10 08:11:13 EDT 2016
Updated via https://github.com/Gnucash/gnucash/commit/3877c03e (commit)
via https://github.com/Gnucash/gnucash/commit/38e6d7f7 (commit)
from https://github.com/Gnucash/gnucash/commit/c5414e33 (commit)
commit 3877c03ee7542029e08104bd17fdffa36cefa7ec
Merge: c5414e3 38e6d7f
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Oct 10 13:55:35 2016 +0200
Merge branch 'maint'
commit 38e6d7f7cee16ab1b9c315e6a2d8d3f302d8630e
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Oct 10 12:28:49 2016 +0200
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.
diff --git a/src/report/report-system/test/test-report-utilities.scm b/src/report/report-system/test/test-report-utilities.scm
index dd06172..174f647 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 74031ad..0b6c5a8 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))
Summary of changes:
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(-)
More information about the gnucash-changes
mailing list