[Bps-public-commit] r11604 - in SVN-PropDB: . lib/Prophet t

[jesse at bestpractical.com]

Author: jesse
Date: Sun Apr  6 19:53:31 2008
New Revision: 11604

Modified:
   SVN-PropDB/   (props changed)
   SVN-PropDB/lib/Prophet/CLI.pm
   SVN-PropDB/lib/Prophet/Replica/RT/PullEncoder.pm
   SVN-PropDB/lib/Prophet/Test.pm
   SVN-PropDB/t/real-conflicting-merge.t
   SVN-PropDB/t/sd-rt.t

Log:
 r29410 at 68-246-109-123:  jesse | 2008-04-06 13:53:18 -1000
  * Running tests in verbose mode now fails far fewer tests for me


Modified: SVN-PropDB/lib/Prophet/CLI.pm
==============================================================================
--- SVN-PropDB/lib/Prophet/CLI.pm	(original)
+++ SVN-PropDB/lib/Prophet/CLI.pm	Sun Apr  6 19:53:31 2008
@@ -217,7 +217,7 @@
         }
     );
 
-    for ( @{ $records->as_array_ref } ) {
+    for ( sort {$a->uuid cmp  $b->uuid} @{ $records->as_array_ref } ) {
         print $_->format_summary . "\n";
     }
 }

Modified: SVN-PropDB/lib/Prophet/Replica/RT/PullEncoder.pm
==============================================================================
--- SVN-PropDB/lib/Prophet/Replica/RT/PullEncoder.pm	(original)
+++ SVN-PropDB/lib/Prophet/Replica/RT/PullEncoder.pm	Sun Apr  6 19:53:31 2008
@@ -27,7 +27,6 @@
     
     my $ticket = $args{'ticket'};
 
-    warn "Working on " . $ticket->{id};
     my $create_state = $ticket;;
     map { $create_state->{$_} = $self->date_to_iso( $create_state->{$_} ) }
         qw(Created Resolved Told LastUpdated Starts Started);

Modified: SVN-PropDB/lib/Prophet/Test.pm
==============================================================================
--- SVN-PropDB/lib/Prophet/Test.pm	(original)
+++ SVN-PropDB/lib/Prophet/Test.pm	Sun Apr  6 19:53:31 2008
@@ -5,7 +5,7 @@
 use base qw/Test::More Exporter/;
 our @EXPORT
     = qw/as_alice as_bob as_charlie as_david as_user run_ok repo_uri_for run_script run_output_matches replica_last_rev replica_merge_tickets replica_uuid_for fetch_newest_changesets ok_added_revisions replica_uuid
-    serialize_conflict serialize_changeset in_gladiator
+    serialize_conflict serialize_changeset in_gladiator diag
     /;
 
 use File::Path 'rmtree';
@@ -39,8 +39,6 @@
     no warnings 'redefine';
 
     sub Test::More::diag {    # bad bad bad # convenient convenient convenient
-                              # my $tb = Test::More->builder;
-
         Test::More->builder->diag(@_) if ( $Test::Harness::Verbose || $ENV{'TEST_VERBOSE'} );
     }
 }

Modified: SVN-PropDB/t/real-conflicting-merge.t
==============================================================================
--- SVN-PropDB/t/real-conflicting-merge.t	(original)
+++ SVN-PropDB/t/real-conflicting-merge.t	Sun Apr  6 19:53:31 2008
@@ -27,7 +27,6 @@
     if ( $out =~ /^(.*?)\s./ ) {
         $record_id = $1;
     }
-    diag($record_id);
 
     run_ok( 'prophet-node-update', [ '--type', 'Bug', '--uuid', $record_id, '--status' => 'stalled' ] );
     run_output_matches(
@@ -97,7 +96,6 @@
 as_alice {
     my $source = Prophet::Replica->new( { url => repo_uri_for('bob') } );
     my $target = Prophet::Replica->new( { url => repo_uri_for('alice') } );
-
     throws_ok {
         $target->import_changesets( from => $source, );
     }

Modified: SVN-PropDB/t/sd-rt.t
==============================================================================
--- SVN-PropDB/t/sd-rt.t	(original)
+++ SVN-PropDB/t/sd-rt.t	Sun Apr  6 19:53:31 2008
@@ -41,10 +41,8 @@
         subject => 'Fly Man',
     )->store(text => "Ticket Comment");
 
-diag $ticket->id;
 my ($ret, $out, $err);
 ($ret, $out, $err) = run_script('sd', ['pull', $sd_rt_url]);
-warn $err;
 my ($yatta_uuid, $flyman_uuid);
 run_output_matches('sd', ['ticket', '--list', '--regex', '.'], [qr/(.*?)(?{ $flyman_uuid = $1 }) Fly Man new/]);
 
@@ -63,7 +61,6 @@
 
 run_output_matches('sd', ['ticket', '--create', '--summary', 'YATTA', '--status', 'new'], [qr/Created ticket (.*)(?{ $yatta_uuid = $1 })/]);
 
-diag $yatta_uuid;
 
 run_output_matches('sd', ['ticket', '--list', '--regex', '.'],
                    [ sort 
@@ -72,7 +69,6 @@
                    ]);
 
 ($ret, $out, $err) = run_script('sd', ['push', $sd_rt_url]);
-diag $err;
 my @tix = $rt->search(
         type  => 'ticket',
         query => "Subject='YATTA'"
@@ -110,7 +106,6 @@
 
 warn "===> bad pull";
 ($ret, $out, $err) = run_script('sd', ['pull', $sd_rt_url]);
-diag $err;
 run_output_matches('sd', ['ticket', '--list', '--regex', '.'],
                    [ sort
                     "$yatta_uuid YATTA open",