From 55f5868380a4917028365256abcfd6d0b5f0a1e4 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Thu, 29 Oct 2009 00:52:51 -0400
Subject: Setting --date-format in ~/.ledgerrc works again

---
 test/LedgerHarness.py              | 6 ++++--
 test/baseline/opt-color.test       | 2 +-
 test/baseline/opt-date-format.test | 6 +++---
 test/regress/727B2DF8.test         | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'test')

diff --git a/test/LedgerHarness.py b/test/LedgerHarness.py
index cd8beca8..cf65f590 100755
--- a/test/LedgerHarness.py
+++ b/test/LedgerHarness.py
@@ -48,8 +48,10 @@ class LedgerHarness:
         if columns:
             insert += ' --columns=80'
 
-        command = re.sub('\$ledger', '%s%s --args-only --no-color --pager=none' % \
-                         (self.ledger, insert), command)
+        command = re.sub('\$ledger', '%s%s %s %s %s %s' % \
+                         (self.ledger, insert, '--args-only',
+                          '--no-color', '--pager=none',
+                          '--date-format=%y-%b-%d'), command)
 
         return Popen(command, shell=True, close_fds=True, env=env,
                      stdin=PIPE, stdout=PIPE, stderr=PIPE)
diff --git a/test/baseline/opt-color.test b/test/baseline/opt-color.test
index 169c46ae..6520c7dc 100644
--- a/test/baseline/opt-color.test
+++ b/test/baseline/opt-color.test
@@ -1,4 +1,4 @@
-bal --color
+bal --color --force-color
 <<<
 2007/02/02 RD VMMXX
     Assets:Investments:Vanguard:VMMXX  0.350 VMMXX @ $1.00
diff --git a/test/baseline/opt-date-format.test b/test/baseline/opt-date-format.test
index 7a6983cf..b4e1a332 100644
--- a/test/baseline/opt-date-format.test
+++ b/test/baseline/opt-date-format.test
@@ -4,8 +4,8 @@ reg --date-format='%Y'
     Assets:Investments:Vanguard:VMMXX  0.350 VMMXX @ $1.00
     Income:Dividends:Vanguard:VMMXX        $-0.35
 >>>1
-2007      RD VMMXX              As:In:Vanguard:VMMXX    0.350 VMMXX  0.350 VMMXX
-                                In:Di:Vanguard:VMMXX         $-0.35       $-0.35
-                                                                     0.350 VMMXX
+2007 RD VMMXX              As:In:Vanguard:VMMXX      0.350 VMMXX  0.350 VMMXX
+                           In:Di:Vanguard:VMMXX           $-0.35       $-0.35
+                                                                  0.350 VMMXX
 >>>2
 === 0
diff --git a/test/regress/727B2DF8.test b/test/regress/727B2DF8.test
index 599090a1..8c29e1ff 100644
--- a/test/regress/727B2DF8.test
+++ b/test/regress/727B2DF8.test
@@ -1,4 +1,4 @@
-reg --color
+reg --color --force-color
 <<<
 N $
 
-- 
cgit v1.2.3