[Bps-public-commit] r16690 - in sd/branches/init-and-clone: .

[jesse at bestpractical.com]

Author: jesse
Date: Thu Nov  6 01:49:36 2008
New Revision: 16690

Modified:
   sd/branches/init-and-clone/   (props changed)
   sd/branches/init-and-clone/t/sd-hm-comments.t
   sd/branches/init-and-clone/t/sd-hm-update.t
   sd/branches/init-and-clone/t/sd-rt-hm.t
   sd/branches/init-and-clone/t/sd-rt-permission.t

Log:
 r49331 at 31b:  jesse | 2008-11-06 11:50:52 +0900
 * test munging for init-and-clone


Modified: sd/branches/init-and-clone/t/sd-hm-comments.t
==============================================================================
--- sd/branches/init-and-clone/t/sd-hm-comments.t	(original)
+++ sd/branches/init-and-clone/t/sd-hm-comments.t	Thu Nov  6 01:49:36 2008
@@ -40,7 +40,13 @@
 
 my ($yatta_uuid, $yatta_id);
 {
+    diag($sd_hm_url);
     my ($ret, $out, $err) = run_script( 'sd', [ 'clone', '--from', $sd_hm_url ] );
+    
+    diag($ret);
+    diag($out);
+    diag($err);
+    
     run_output_matches( 'sd', [qw(ticket list --regex .)], [qr/(.*?)(?{ $yatta_uuid = $1 }) YATTA (.*)/] );
     ( $ret, $out, $err ) = run_script( 'sd', [ qw(ticket show --batch --id), $yatta_uuid ] );
     $yatta_id = $1 if $out =~ /^id: (\d+) /m;

Modified: sd/branches/init-and-clone/t/sd-hm-update.t
==============================================================================
--- sd/branches/init-and-clone/t/sd-hm-update.t	(original)
+++ sd/branches/init-and-clone/t/sd-hm-update.t	Thu Nov  6 01:49:36 2008
@@ -42,10 +42,12 @@
 
 my ($yatta_uuid, $yatta_id);
 {
-    my ($ret, $out, $err) = run_script( 'sd', [ 'pull', '--from', $sd_hm_url ] );
+    my ($ret, $out, $err) = run_script( 'sd', [ 'clone', '--from', $sd_hm_url ] );
 
     run_output_matches( 'sd', [qw(ticket list --regex .)], [qr/(.*?)(?{ $yatta_uuid = $1 }) YATTA (.*)/] );
     ( $ret, $out, $err ) = run_script( 'sd', [ qw(ticket show --batch --id), $yatta_uuid ] );
+    diag($out);
+    diag($err);
     ($yatta_id, $yatta_uuid) = ($1, $2) if $out =~ /^id: (\d+)\s*\((.*)\)/m;
 }
 

Modified: sd/branches/init-and-clone/t/sd-rt-hm.t
==============================================================================
--- sd/branches/init-and-clone/t/sd-rt-hm.t	(original)
+++ sd/branches/init-and-clone/t/sd-rt-hm.t	Thu Nov  6 01:49:36 2008
@@ -81,7 +81,7 @@
 # now the tests, bob syncs with rt, alice syncs with hm
 as_alice {
     local $ENV{SD_REPO} = $ENV{'PROPHET_REPO'};
-    ( $ret, $out, $err ) = run_script( 'sd', [ 'pull', '--from', $sd_hm_url ] );
+    ( $ret, $out, $err ) = run_script( 'sd', [ 'clone', '--from', $sd_hm_url ] );
     diag($err) if ($err);
     run_output_matches( 'sd', [ 'ticket', 'list', '--regex', '.' ], [qr/^(.*?)(?{ $alice_yatta_id = $1 }) YATTA .*/] );
     $yatta_uuid = get_uuid_for_luid($alice_yatta_id);
@@ -89,8 +89,7 @@
 
 as_bob {
     local $ENV{SD_REPO} = $ENV{'PROPHET_REPO'};
-    run_output_matches( 'sd', [ 'ticket', 'list', '--regex', '.' ], [] );
-
+    run_script_ok('sd',['init']);
     diag("Bob pulling from RT");
     ( $ret, $out, $err ) = run_script( 'sd', [ 'pull', '--from', $sd_rt_url ] );
     diag($err) if ($err);

Modified: sd/branches/init-and-clone/t/sd-rt-permission.t
==============================================================================
--- sd/branches/init-and-clone/t/sd-rt-permission.t	(original)
+++ sd/branches/init-and-clone/t/sd-rt-permission.t	Thu Nov  6 01:49:36 2008
@@ -72,7 +72,7 @@
     TODO: {
         local $TODO = "not coming through for some reason";
         like($err, qr/No tickets found/);
-    }
+        }
 };
 
 diag("grant read rights, ensure we can pull it");