[Bps-public-commit] r13948 - in Prophet/trunk: .

[sartak at bestpractical.com]

Author: sartak
Date: Thu Jul 10 13:08:08 2008
New Revision: 13948

Modified:
   Prophet/trunk/   (props changed)
   Prophet/trunk/t/export.t
   Prophet/trunk/t/real-conflicting-merge.t
   Prophet/trunk/t/simple-conflicting-merge.t

Log:
 r64042 at onn:  sartak | 2008-07-10 13:08:01 -0400
 Adjust some expected output now that "show" is slightly better formatted


Modified: Prophet/trunk/t/export.t
==============================================================================
--- Prophet/trunk/t/export.t	(original)
+++ Prophet/trunk/t/export.t	Thu Jul 10 13:08:08 2008
@@ -39,11 +39,10 @@
         'prophet',
         ['show', '--type',            'Bug',             '--uuid', $record_id ],
         [
-       
-        qr/id: (\d+) \($record_id\)/,
-        
-        
-        'status: stalled', 'from: alice' ],
+            qr/id:     (\d+) \($record_id\)/,
+              'status: stalled',
+              'from:   alice',
+        ],
         'content is correct'
     );
 

Modified: Prophet/trunk/t/real-conflicting-merge.t
==============================================================================
--- Prophet/trunk/t/real-conflicting-merge.t	(original)
+++ Prophet/trunk/t/real-conflicting-merge.t	Thu Jul 10 13:08:08 2008
@@ -33,8 +33,10 @@
         'prophet',
         [ 'show', '--type',            'Bug',             '--uuid', $record_id ],
         [
-        qr/id: (\d+) \($record_id\)/,
-        'status: stalled', 'from: alice' ],
+        qr/id:     (\d+) \($record_id\)/,
+          'status: stalled',
+          'from:   alice',
+        ],
         'content is correct'
     );
 };
@@ -45,9 +47,11 @@
     run_output_matches(
         'prophet',
         [ 'show', '--type',            'Bug',          '--uuid', $record_id ],
-        [ 
-        qr/id: (\d+) \($record_id\)/,
-        'status: open', 'from: alice' ],
+        [
+            qr/id:     (\d+) \($record_id\)/,
+              'status: open',
+              'from:   alice',
+        ],
         'content is correct'
     );
 

Modified: Prophet/trunk/t/simple-conflicting-merge.t
==============================================================================
--- Prophet/trunk/t/simple-conflicting-merge.t	(original)
+++ Prophet/trunk/t/simple-conflicting-merge.t	Thu Jul 10 13:08:08 2008
@@ -32,7 +32,11 @@
     run_output_matches(
         'prophet',
         [ 'show','--type',            'Bug',             '--uuid', $record_id ],
-        [ qr/id: (\d+) \($record_id\)/, 'status: stalled', 'from: alice' ],
+        [
+            qr/id:     (\d+) \($record_id\)/,
+              'status: stalled',
+              'from:   alice',
+        ],
         'content is correct'
     );
 };
@@ -42,7 +46,11 @@
     run_output_matches(
         'prophet',
         ['show', '--type',            'Bug',             '--uuid', $record_id ],
-        [ qr/id: (\d+) \($record_id\)/, 'status: stalled', 'from: alice' ],
+        [
+            qr/id:     (\d+) \($record_id\)/,
+              'status: stalled',
+              'from:   alice',
+        ],
         'content is correct'
     );