From 1d150549b240c40b628e24489dbe91cceaae27c1 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Tue, 13 May 2025 10:48:16 -1000 Subject: [PATCH] ;dev: tests: be more robust when testing a "hledger-VER" executable --- hledger/test/csv.test | 8 ++++---- hledger/test/errors/accounts.test | 2 +- hledger/test/errors/assertions.test | 2 +- hledger/test/errors/autobalanced.test | 2 +- hledger/test/errors/balanced.test | 2 +- hledger/test/errors/commodities.test | 2 +- hledger/test/errors/csvamountonenonzero.test | 2 +- hledger/test/errors/csvamountparse.test | 2 +- hledger/test/errors/csvbalanceparse.test | 2 +- hledger/test/errors/csvbalancetypeparse.test | 2 +- hledger/test/errors/csvdateformat.test | 2 +- hledger/test/errors/csvdateparse.test | 2 +- hledger/test/errors/csvdaterule.test | 2 +- hledger/test/errors/csvdecimalmarkparse.test | 2 +- hledger/test/errors/csvifblocknonempty.test | 2 +- hledger/test/errors/csviftablefieldnames.test | 2 +- hledger/test/errors/csviftablenonempty.test | 2 +- hledger/test/errors/csviftablevaluecount.test | 2 +- hledger/test/errors/csvnoinclude.test | 2 +- hledger/test/errors/csvskipvalue.test | 2 +- hledger/test/errors/csvstatusparse.test | 2 +- hledger/test/errors/csvstdinrules.test | 2 +- hledger/test/errors/csvtwofields.test | 2 +- hledger/test/errors/ordereddates.test | 2 +- hledger/test/errors/parseable-dates.test | 2 +- hledger/test/errors/parseable-regexps.test | 2 +- hledger/test/errors/parseable.test | 2 +- hledger/test/errors/payees.test | 2 +- hledger/test/errors/recentassertions.test | 2 +- hledger/test/errors/tcclockouttime.test | 2 +- hledger/test/errors/tcorderedactions.test | 2 +- hledger/test/errors/uniqueleafnames.test | 2 +- hledger/test/forecast.test | 2 +- hledger/test/journal/directive-account.test | 4 ++-- hledger/test/journal/parse-errors.test | 4 ++-- hledger/test/query-expr.test | 2 +- hledger/test/roi.test | 2 +- hledger/test/run.test | 4 ++-- 38 files changed, 44 insertions(+), 44 deletions(-) diff --git a/hledger/test/csv.test b/hledger/test/csv.test index d571578f9..603a31249 100644 --- a/hledger/test/csv.test +++ b/hledger/test/csv.test @@ -774,7 +774,7 @@ if|account2|comment %amount 150|acct2 %description Flubber|acct| $ ./csvtest.sh ->2 /hledger: Error: input.rules:6:1: +>2 /Error: input.rules:6:1: \| 6 \| %amount 150\|acct2 \| \^ @@ -796,7 +796,7 @@ if Flubber account2 acct comment cmt $ ./csvtest.sh ->2 /hledger: Error: input.rules:5:1: +>2 /Error: input.rules:5:1: \| 5 \| if Flubber \| \^ @@ -822,7 +822,7 @@ if Flubber account2 %myaccount2 $ ./csvtest.sh ->2 /hledger: Error: input.rules:6:3: +>2 /Error: input.rules:6:3: \| 6 \| myaccount2 acct \| \^\^\^\^\^\^\^\^\^\^\^\^ @@ -870,7 +870,7 @@ if account2 comment %amount 150 acct2 %description Flubber acct $ ./csvtest.sh ->2 /hledger: Error: input.rules:5:1: +>2 /Error: input.rules:5:1: \| 5 \| if account2 comment \| \^ diff --git a/hledger/test/errors/accounts.test b/hledger/test/errors/accounts.test index 37dcc9cc3..da0c6ae92 100644 --- a/hledger/test/errors/accounts.test +++ b/hledger/test/errors/accounts.test @@ -1,5 +1,5 @@ $$$ hledger check accounts -f accounts.j ->>>2 /hledger: Error: .*accounts.j:4: +>>>2 /Error: .*accounts.j:4: \| 2022-01-01 4 \| \(a\) 1 \| \^ diff --git a/hledger/test/errors/assertions.test b/hledger/test/errors/assertions.test index ef2a7b100..21749f9ba 100644 --- a/hledger/test/errors/assertions.test +++ b/hledger/test/errors/assertions.test @@ -1,5 +1,5 @@ $$$ hledger check -f assertions.j ->>>2 /hledger: Error: .*assertions.j:4:8: +>>>2 /Error: .*assertions.j:4:8: \| 2022-01-01 4 \| a 0 = 1 \| \^\^\^ diff --git a/hledger/test/errors/autobalanced.test b/hledger/test/errors/autobalanced.test index 61136c6f7..138fbe0fc 100644 --- a/hledger/test/errors/autobalanced.test +++ b/hledger/test/errors/autobalanced.test @@ -1,5 +1,5 @@ $$$ hledger check -f autobalanced.j ->>>2 /hledger: Error: .*autobalanced.j:3-4: +>>>2 /Error: .*autobalanced.j:3-4: 3 \| 2022-01-01 \| a 1 diff --git a/hledger/test/errors/balanced.test b/hledger/test/errors/balanced.test index 350ec88f0..03bd6c4c2 100644 --- a/hledger/test/errors/balanced.test +++ b/hledger/test/errors/balanced.test @@ -1,5 +1,5 @@ $$$ hledger check balanced -f balanced.j ->>>2 /hledger: Error: .*balanced.j:5-7: +>>>2 /Error: .*balanced.j:5-7: 5 \| 2022-01-01 \| a 1 A \| b -1 B diff --git a/hledger/test/errors/commodities.test b/hledger/test/errors/commodities.test index 3924dfb51..472377429 100644 --- a/hledger/test/errors/commodities.test +++ b/hledger/test/errors/commodities.test @@ -1,5 +1,5 @@ $$$ hledger check commodities -f commodities.j ->>>2 /hledger: Error: .*commodities.j:6: +>>>2 /Error: .*commodities.j:6: \| 2022-01-01 6 \| \(a\) A 1 \| \^\^\^ diff --git a/hledger/test/errors/csvamountonenonzero.test b/hledger/test/errors/csvamountonenonzero.test index 1ab7b0bbe..567b39896 100644 --- a/hledger/test/errors/csvamountonenonzero.test +++ b/hledger/test/errors/csvamountonenonzero.test @@ -1,5 +1,5 @@ $$$ hledger check -f csvamountonenonzero.csv ->>>2 /hledger: Error: in CSV rules: +>>>2 /Error: in CSV rules: While processing CSV record: "2022-01-03","1","2" while calculating amount for posting 1 rule "amount-in %2" assigned value "1" diff --git a/hledger/test/errors/csvamountparse.test b/hledger/test/errors/csvamountparse.test index 4c5eb6079..0712c38e3 100644 --- a/hledger/test/errors/csvamountparse.test +++ b/hledger/test/errors/csvamountparse.test @@ -1,5 +1,5 @@ $$$ hledger check -f csvamountparse.csv ->>>2 /hledger: Error: could not parse "badamount" as an amount +>>>2 /Error: could not parse "badamount" as an amount CSV record: "2022-01-03","badamount" the amount rule is: %2 the date rule is: %1 diff --git a/hledger/test/errors/csvbalanceparse.test b/hledger/test/errors/csvbalanceparse.test index 1811d6b19..efbd2fec0 100644 --- a/hledger/test/errors/csvbalanceparse.test +++ b/hledger/test/errors/csvbalanceparse.test @@ -1,5 +1,5 @@ $$$ hledger check -f csvbalanceparse.csv ->>>2 /hledger: Error: could not parse "badbalance" as balance1 amount +>>>2 /Error: could not parse "badbalance" as balance1 amount CSV record: "2022-01-03","badbalance" the balance rule is: %2 the date rule is: %1 diff --git a/hledger/test/errors/csvbalancetypeparse.test b/hledger/test/errors/csvbalancetypeparse.test index 48dd14ea6..99ec53f1b 100644 --- a/hledger/test/errors/csvbalancetypeparse.test +++ b/hledger/test/errors/csvbalancetypeparse.test @@ -1,5 +1,5 @@ $$$ hledger check -f csvbalancetypeparse.csv ->>>2 /hledger: Error: balance-type "badtype" is invalid. Use =, ==, =\* or ==\*. +>>>2 /Error: balance-type "badtype" is invalid. Use =, ==, =\* or ==\*. CSV record: "2022-01-01","1" the balance rule is: %2 the date rule is: %1 diff --git a/hledger/test/errors/csvdateformat.test b/hledger/test/errors/csvdateformat.test index a636e5ee4..6d6c2e419 100644 --- a/hledger/test/errors/csvdateformat.test +++ b/hledger/test/errors/csvdateformat.test @@ -1,5 +1,5 @@ $$$ hledger print -f csvdateformat.csv ->>>2 /hledger: Error: could not parse "a" as a date using date format "YYYY\/M\/D", "YYYY-M-D" or "YYYY.M.D" +>>>2 /Error: could not parse "a" as a date using date format "YYYY\/M\/D", "YYYY-M-D" or "YYYY.M.D" CSV record: "a","b" the date rule is: %1 the date-format is: unspecified diff --git a/hledger/test/errors/csvdateparse.test b/hledger/test/errors/csvdateparse.test index 7d47a7100..5642537bf 100644 --- a/hledger/test/errors/csvdateparse.test +++ b/hledger/test/errors/csvdateparse.test @@ -1,5 +1,5 @@ $$$ hledger check -f csvdateparse.csv ->>>2 /hledger: Error: could not parse "baddate" as a date using date format "%Y-%m-%d" +>>>2 /Error: could not parse "baddate" as a date using date format "%Y-%m-%d" CSV record: "baddate","b" the date rule is: %1 the date-format is: %Y-%m-%d diff --git a/hledger/test/errors/csvdaterule.test b/hledger/test/errors/csvdaterule.test index 8156ade92..2c8d57108 100644 --- a/hledger/test/errors/csvdaterule.test +++ b/hledger/test/errors/csvdaterule.test @@ -1,5 +1,5 @@ $$$ hledger check -f csvdaterule.csv ->>>2 /hledger: Error: offset=0: +>>>2 /Error: offset=0: Please specify \(at top level\) the date field. Eg: date %1 / >>>= 1 diff --git a/hledger/test/errors/csvdecimalmarkparse.test b/hledger/test/errors/csvdecimalmarkparse.test index 0ed46520b..24823f099 100644 --- a/hledger/test/errors/csvdecimalmarkparse.test +++ b/hledger/test/errors/csvdecimalmarkparse.test @@ -1,4 +1,4 @@ $$$ hledger check -f csvdecimalmarkparse.csv ->>>2 /hledger: Error: decimal-mark's argument should be "." or "," \(not "badmark"\) +>>>2 /Error: decimal-mark's argument should be "." or "," \(not "badmark"\) / >>>= 1 diff --git a/hledger/test/errors/csvifblocknonempty.test b/hledger/test/errors/csvifblocknonempty.test index 859063b96..44559b381 100644 --- a/hledger/test/errors/csvifblocknonempty.test +++ b/hledger/test/errors/csvifblocknonempty.test @@ -1,5 +1,5 @@ $$$ hledger check -f csvifblocknonempty.csv ->>>2 /hledger: Error: .*csvifblocknonempty.csv.rules:2:1: +>>>2 /Error: .*csvifblocknonempty.csv.rules:2:1: \| 2 \| if foo \| \^ diff --git a/hledger/test/errors/csviftablefieldnames.test b/hledger/test/errors/csviftablefieldnames.test index bac26db57..2bf48c4ed 100644 --- a/hledger/test/errors/csviftablefieldnames.test +++ b/hledger/test/errors/csviftablefieldnames.test @@ -1,5 +1,5 @@ $$$ hledger check -f csviftablefieldnames.csv ->>>2 /hledger: Error: .*csviftablefieldnames.csv.rules:2:9: +>>>2 /Error: .*csviftablefieldnames.csv.rules:2:9: \| 2 \| if,date,nosuchfield,description \| \^\^\^\^\^\^\^\^\^\^\^\^ diff --git a/hledger/test/errors/csviftablenonempty.test b/hledger/test/errors/csviftablenonempty.test index b405c1e6d..71d9a5eed 100644 --- a/hledger/test/errors/csviftablenonempty.test +++ b/hledger/test/errors/csviftablenonempty.test @@ -1,5 +1,5 @@ $$$ hledger check -f csviftablenonempty.csv ->>>2 /hledger: Error: .*csviftablenonempty.csv.rules:2:1: +>>>2 /Error: .*csviftablenonempty.csv.rules:2:1: \| 2 \| if,date,description,comment \| \^ diff --git a/hledger/test/errors/csviftablevaluecount.test b/hledger/test/errors/csviftablevaluecount.test index de0bc6c6d..fec8900fb 100644 --- a/hledger/test/errors/csviftablevaluecount.test +++ b/hledger/test/errors/csviftablevaluecount.test @@ -1,5 +1,5 @@ $$$ hledger check -f csviftablevaluecount.csv ->>>2 /hledger: Error: .*csviftablevaluecount.csv.rules:4:1: +>>>2 /Error: .*csviftablevaluecount.csv.rules:4:1: \| 4 \| one,val1 \| \^ diff --git a/hledger/test/errors/csvnoinclude.test b/hledger/test/errors/csvnoinclude.test index 58208a4de..eb04bb3c0 100644 --- a/hledger/test/errors/csvnoinclude.test +++ b/hledger/test/errors/csvnoinclude.test @@ -1,4 +1,4 @@ $$$ hledger check -f csvnoinclude.j ->>>2 /hledger: Error: sorry, CSV files can't be included yet +>>>2 /Error: sorry, CSV files can't be included yet / >>>= 1 diff --git a/hledger/test/errors/csvskipvalue.test b/hledger/test/errors/csvskipvalue.test index 5f6cd81bc..251daa52b 100644 --- a/hledger/test/errors/csvskipvalue.test +++ b/hledger/test/errors/csvskipvalue.test @@ -1,4 +1,4 @@ $$$ hledger check -f csvskipvalue.csv ->>>2 /hledger: Error: could not parse skip value: badval +>>>2 /Error: could not parse skip value: badval / >>>= 1 diff --git a/hledger/test/errors/csvstatusparse.test b/hledger/test/errors/csvstatusparse.test index 308bae687..21db7cf5a 100644 --- a/hledger/test/errors/csvstatusparse.test +++ b/hledger/test/errors/csvstatusparse.test @@ -1,5 +1,5 @@ $$$ hledger print -f csvstatusparse.csv ->>>2 /hledger: Error: could not parse status value "badstatus" \(should be \*, ! or empty\) +>>>2 /Error: could not parse status value "badstatus" \(should be \*, ! or empty\) the parse error is: 1:1: \| 1 \| badstatus diff --git a/hledger/test/errors/csvstdinrules.test b/hledger/test/errors/csvstdinrules.test index 81a3371eb..110a48df0 100644 --- a/hledger/test/errors/csvstdinrules.test +++ b/hledger/test/errors/csvstdinrules.test @@ -1,4 +1,4 @@ $$$ sh csvstdinrules.sh ->>>2 /hledger: Error: please use --rules when reading CSV from stdin +>>>2 /Error: please use --rules when reading CSV from stdin / >>>= 1 diff --git a/hledger/test/errors/csvtwofields.test b/hledger/test/errors/csvtwofields.test index 9ab83b90b..0f6d5f506 100644 --- a/hledger/test/errors/csvtwofields.test +++ b/hledger/test/errors/csvtwofields.test @@ -1,4 +1,4 @@ $$$ hledger check -f csvtwofields.csv ->>>2 /hledger: Error: CSV record \["b"\] has less than two fields +>>>2 /Error: CSV record \["b"\] has less than two fields / >>>= 1 diff --git a/hledger/test/errors/ordereddates.test b/hledger/test/errors/ordereddates.test index 281a522e5..5710068e2 100644 --- a/hledger/test/errors/ordereddates.test +++ b/hledger/test/errors/ordereddates.test @@ -1,5 +1,5 @@ $$$ hledger check ordereddates -f ordereddates.j ->>>2 /hledger: Error: .*ordereddates.j:10: +>>>2 /Error: .*ordereddates.j:10: 7 \| 2022-01-02 p \| \(a\) 1 diff --git a/hledger/test/errors/parseable-dates.test b/hledger/test/errors/parseable-dates.test index 17260314e..4bf1d0f07 100644 --- a/hledger/test/errors/parseable-dates.test +++ b/hledger/test/errors/parseable-dates.test @@ -1,5 +1,5 @@ $$$ hledger check -f parseable-dates.j ->>>2 /hledger: Error: .*parseable-dates.j:3:1: +>>>2 /Error: .*parseable-dates.j:3:1: \| 3 \| 2022\/1\/32 \| \^\^\^\^\^\^\^\^\^ diff --git a/hledger/test/errors/parseable-regexps.test b/hledger/test/errors/parseable-regexps.test index f0835eea4..522f6ee5d 100644 --- a/hledger/test/errors/parseable-regexps.test +++ b/hledger/test/errors/parseable-regexps.test @@ -1,5 +1,5 @@ $$$ hledger check -f parseable-regexps.j ->>>2 /hledger: Error: .*parseable-regexps.j:3:8: +>>>2 /Error: .*parseable-regexps.j:3:8: \| 3 \| alias \/\(\/ = a \| \^ diff --git a/hledger/test/errors/parseable.test b/hledger/test/errors/parseable.test index 6ff30877f..9ee0a213d 100644 --- a/hledger/test/errors/parseable.test +++ b/hledger/test/errors/parseable.test @@ -1,5 +1,5 @@ $$$ hledger check -f parseable.j ->>>2 /hledger: Error: .*parseable.j:3:2: +>>>2 /Error: .*parseable.j:3:2: \| 3 \| 1 \| \^ diff --git a/hledger/test/errors/payees.test b/hledger/test/errors/payees.test index 4c0ef0d3f..4ac4fae65 100644 --- a/hledger/test/errors/payees.test +++ b/hledger/test/errors/payees.test @@ -1,5 +1,5 @@ $$$ hledger check payees -f payees.j ->>>2 /hledger: Error: .*payees.j:6: +>>>2 /Error: .*payees.j:6: 6 \| 2022-01-01 p \| \^ \| \(a\) A 1 diff --git a/hledger/test/errors/recentassertions.test b/hledger/test/errors/recentassertions.test index 1c746d9bc..11595eb20 100644 --- a/hledger/test/errors/recentassertions.test +++ b/hledger/test/errors/recentassertions.test @@ -1,5 +1,5 @@ $$$ hledger check recentassertions -f recentassertions.j ->>>2 /hledger: Error: .*recentassertions.j:18: +>>>2 /Error: .*recentassertions.j:18: \| 2022-01-09 bad1 18 \| a 0 \| \^ diff --git a/hledger/test/errors/tcclockouttime.test b/hledger/test/errors/tcclockouttime.test index 4f48ad5b3..ac31612f3 100644 --- a/hledger/test/errors/tcclockouttime.test +++ b/hledger/test/errors/tcclockouttime.test @@ -1,5 +1,5 @@ $$$ hledger check -f tcclockouttime.timeclock ->>>2 /hledger: Error: .*tcclockouttime.timeclock:5:1: +>>>2 /Error: .*tcclockouttime.timeclock:5:1: 5 \| o 2022-01-01 00:00:00 \| \^ diff --git a/hledger/test/errors/tcorderedactions.test b/hledger/test/errors/tcorderedactions.test index 4a3806793..66adac1b0 100644 --- a/hledger/test/errors/tcorderedactions.test +++ b/hledger/test/errors/tcorderedactions.test @@ -1,5 +1,5 @@ $$$ hledger check -f tcorderedactions.timeclock ->>>2 /hledger: Error: .*tcorderedactions.timeclock:8:1: +>>>2 /Error: .*tcorderedactions.timeclock:8:1: 8 \| i 2022-01-01 00:01:00 \| \^ diff --git a/hledger/test/errors/uniqueleafnames.test b/hledger/test/errors/uniqueleafnames.test index d6d2161e2..39333a973 100644 --- a/hledger/test/errors/uniqueleafnames.test +++ b/hledger/test/errors/uniqueleafnames.test @@ -1,5 +1,5 @@ $$$ hledger check uniqueleafnames -f uniqueleafnames.j ->>>2 /hledger: Error: .*uniqueleafnames.j:12: +>>>2 /Error: .*uniqueleafnames.j:12: \| 2022-01-01 p 9 \| \(a:c\) 1 ... diff --git a/hledger/test/forecast.test b/hledger/test/forecast.test index e1baf2c6e..dd3ee1bb3 100644 --- a/hledger/test/forecast.test +++ b/hledger/test/forecast.test @@ -170,7 +170,7 @@ Balance changes in 2016-10-01..2017-01-31: # ** 9. Parse error in malformed forecast period expression $ hledger bal -M -b 2016-10 -e 2017-02 -f - --forecast=20160801-foobar > ->2 /hledger: Error: could not parse forecast period : 1:10: +>2 /Error: could not parse forecast period : 1:10: \| 1 \| 20160801-foobar \| \^ diff --git a/hledger/test/journal/directive-account.test b/hledger/test/journal/directive-account.test index 8d31bd356..1981d9ad7 100644 --- a/hledger/test/journal/directive-account.test +++ b/hledger/test/journal/directive-account.test @@ -73,7 +73,7 @@ Expenses:Food account (a) $ hledger -f- accounts ->2 /hledger: Error: -:1:9: +>2 /Error: -:1:9: \| 1 \| account \(a\) \| \^ @@ -88,7 +88,7 @@ expecting account name without brackets account [a] $ hledger -f- accounts ->2 /hledger: Error: -:1:9: +>2 /Error: -:1:9: \| 1 \| account \[a\] \| \^ diff --git a/hledger/test/journal/parse-errors.test b/hledger/test/journal/parse-errors.test index 417079127..4ef60f3a3 100644 --- a/hledger/test/journal/parse-errors.test +++ b/hledger/test/journal/parse-errors.test @@ -6,7 +6,7 @@ 2018 $ hledger -f - print ->2 /hledger: Error: -:1:5: +>2 /Error: -:1:5: \| 1 \| 2018 \| \^ @@ -122,7 +122,7 @@ $ hledger -f- print b 1B $ hledger -f- print ->2 /hledger: Error: -:1-3: +>2 /Error: -:1-3: 1 \| 2020-01-01 \| a 1A \| b 1B diff --git a/hledger/test/query-expr.test b/hledger/test/query-expr.test index 3d9a2a5d0..d8d6b5891 100644 --- a/hledger/test/query-expr.test +++ b/hledger/test/query-expr.test @@ -129,7 +129,7 @@ $ hledger -f - print expr:"not tag:transactiontag=B" # ** 9. Having parentheses directly follow 'not' sees 'not' as part of a query. $ hledger -f - print expr:"not(tag:transactiontag=B)" ->2 /hledger: Error: This regular expression is invalid or unsupported, please correct it: +>2 /Error: This regular expression is invalid or unsupported, please correct it: not\(tag:transactiontag=B / >=1 diff --git a/hledger/test/roi.test b/hledger/test/roi.test index 1074e4d93..935e5debd 100644 --- a/hledger/test/roi.test +++ b/hledger/test/roi.test @@ -236,7 +236,7 @@ $ hledger -f- roi -p 2019-11 Assets:Checking 101 A Unrealized PnL $ hledger -f- roi -p 2019-11 --inv Investment --pnl PnL ->2 /hledger: Error: Amounts could not be converted to a single commodity: \["10 B","-9 B @@ 100 A","100 C"\]/ +>2 /Error: Amounts could not be converted to a single commodity: \["10 B","-9 B @@ 100 A","100 C"\]/ >= 1 # ** 10. Forcing valuation via --value diff --git a/hledger/test/run.test b/hledger/test/run.test index 0565cc87f..0a4a5788f 100644 --- a/hledger/test/run.test +++ b/hledger/test/run.test @@ -6,13 +6,13 @@ assets:cash -$100 expenses:food $ hledger run -f- aregister cash ->2 /hledger: Error: aregister: openFile: does not exist \(No such file or directory\)/ +>2 /Error: aregister: openFile: does not exist \(No such file or directory\)/ >=1 # ** 2. Run refuses to read input file and commands from stdin < $ hledger run -f- ->2 /hledger: Error: 'run' can't read commands from stdin, as one of the input files was stdin as well/ +>2 /Error: 'run' can't read commands from stdin, as one of the input files was stdin as well/ >=1 # ** 3. Run one command from command line