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

[sartak at bestpractical.com]

Author: sartak
Date: Thu Nov  6 14:07:18 2008
New Revision: 16728

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

Log:
 r75144 at onn:  sartak | 2008-11-06 14:06:42 -0500
 We still merge changesets even if they fail; fix todo tests


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 14:07:18 2008
@@ -22,7 +22,7 @@
 
 }
 
-use Prophet::Test tests => 22;
+use Prophet::Test tests => 23;
 use App::SD::Test;
 use RT::Client::REST;
 use RT::Client::REST::Ticket;
@@ -104,9 +104,21 @@
     ok($ret);
     like($err, qr/You are not allowed to modify ticket $ticket_id/);
 
+    SKIP: {
+        skip "test needs fixing", 1;
+
+        # we should know exactly how many changesets there are.. used to be 1,
+        # now it's 13. one must fail to be merged but we can still report that
+        # the others (up to but excluding the failure) were successfully merged
+        unlike($out, qr/Merged 12 changesets/);
+    }
+
+    # try again to make sure we still have pending changesets
+    ($ret, $out, $err) = run_script('sd', ['push', '--to',  $sd_alice_url]);
+
     TODO: {
-        local $TODO = "we report success even though it failed";
-        unlike($out, qr/Merged one changeset/);
+        local $TODO = "we mark all changesets as merged even if some failed";
+        unlike($out, qr/No new changesets/, "there are still pending changesets");
     }
 };