[Bps-public-commit] r12492 - in sd/trunk: .

[jesse at bestpractical.com]

Author: jesse
Date: Sat May 17 09:12:11 2008
New Revision: 12492

Modified:
   sd/trunk/   (props changed)
   sd/trunk/t/sd-rt-hm.t
   sd/trunk/t/sd-rt.t

Log:
 r31230 at dhcp113 (orig r12488):  jesse | 2008-05-17 22:10:57 +0900
  r31199 at dhcp113:  jesse | 2008-05-17 22:10:14 +0900
  * unorder some tests when we can't guarantee order of results
 


Modified: sd/trunk/t/sd-rt-hm.t
==============================================================================
--- sd/trunk/t/sd-rt-hm.t	(original)
+++ sd/trunk/t/sd-rt-hm.t	Sat May 17 09:12:11 2008
@@ -103,7 +103,7 @@
     $flyman_uuid = get_uuid_for_luid($bob_flyman_id);
     my $bob_yatta_id = get_luid_for_uuid($yatta_uuid);
 
-    run_output_matches(
+    run_output_matches_unordered(
         'sd',
         [ 'ticket',                             'list', '--regex', '.' ],
         [ reverse sort "$bob_yatta_id YATTA (no status)", "$bob_flyman_id Fly Man new" ]
@@ -124,7 +124,7 @@
 
     $alice_flyman_id = get_luid_for_uuid($flyman_uuid);
 
-    run_output_matches(
+    run_output_matches_unordered(
         'sd',
         [ 'ticket',                             'list', '--regex', '.' ],
         [ sort "$alice_yatta_id YATTA (no status)", "$alice_flyman_id Fly Man new" ]

Modified: sd/trunk/t/sd-rt.t
==============================================================================
--- sd/trunk/t/sd-rt.t	(original)
+++ sd/trunk/t/sd-rt.t	Sat May 17 09:12:11 2008
@@ -70,11 +70,7 @@
     [qr/Created ticket (\d+)(?{ $yatta_id = $1 })/]
 );
 
-run_output_matches(
-    'sd',
-    [ 'ticket',                     'list', '--regex', '.' ],
-    [ sort "$yatta_id YATTA new", "$flyman_id Fly Man open" ]
-);
+run_output_matches_unordered( 'sd', [ 'ticket',                     'list', '--regex', '.' ], [sort  "$yatta_id YATTA new", "$flyman_id Fly Man open" ]);
 
 ( $ret, $out, $err ) = run_script( 'sd', [ 'push', '--to', $sd_rt_url ] );
 my @tix = $rt->search(
@@ -84,12 +80,16 @@
 
 ok( scalar @tix, 'YATTA pushed' );
 
+
+
+
+
 ( $ret, $out, $err ) = run_script( 'sd', [ 'pull', '--from', $sd_rt_url ] );
 
-run_output_matches(
+run_output_matches_unordered(
     'sd',
     [ 'ticket',                     'list', '--regex', '.' ],
-    [ sort "$yatta_id YATTA new", "$flyman_id Fly Man open", ]
+    [  "$yatta_id YATTA new", "$flyman_id Fly Man open", ]
 );
 
 RT::Client::REST::Ticket->new(
@@ -100,10 +100,10 @@
 
 ( $ret, $out, $err ) = run_script( 'sd', [ 'pull', '--from', $sd_rt_url ] );
 
-run_output_matches(
+run_output_matches_unordered(
     'sd',
     [ 'ticket',                     'list', '--regex', '.' ],
-    [ sort "$yatta_id YATTA new", "$flyman_id Fly Man stalled", ]
+    [ "$yatta_id YATTA new", "$flyman_id Fly Man stalled", ]
 );
 
 RT::Client::REST::Ticket->new(
@@ -114,10 +114,10 @@
 
 diag( "===> bad pull");
 ( $ret, $out, $err ) = run_script( 'sd', [ 'pull', '--from', $sd_rt_url ] );
-run_output_matches(
+run_output_matches_unordered(
     'sd',
     [ 'ticket',                      'list', '--regex', '.' ],
-    [ sort "$yatta_id YATTA open", "$flyman_id Fly Man stalled", ]
+    [ "$yatta_id YATTA open", "$flyman_id Fly Man stalled", ]
 );
 
 
@@ -134,10 +134,10 @@
 
  
 ( $ret, $out, $err ) = run_script( 'sd', [ 'pull', '--from', $sd_rt_url ] );
-run_output_matches(
+run_output_matches_unordered(
     'sd',
     [ 'ticket',                      'list', '--regex', '.' ],
-    [ sort "$yatta_id YATTA open", "$flyman_id Fly Man stalled", ]
+    [ "$yatta_id YATTA open", "$flyman_id Fly Man stalled", ]
 );
 
 diag("check to see if YATTA has an attachment");
@@ -206,5 +206,6 @@
     }
     return @attachments
 }
+
 1;