[Bps-public-commit] Test-Chimps-Client branch, master, updated. d48756903e0654ef2fca3ee565add39e778d42d6

Alex M Vandiver alexmv at bestpractical.com
Fri Dec 4 22:18:47 EST 2009


The branch, master has been updated
       via  d48756903e0654ef2fca3ee565add39e778d42d6 (commit)
       via  4a631ff486a89059df45944d59eebbb389f0648a (commit)
       via  3f377d2250e62075f4fc64d0f3dbf48dc82b07fd (commit)
      from  f749d3d1f8ac4cac743e4fb78d26ae8d91bb7ffd (commit)

Summary of changes:
 lib/Test/Chimps/Smoker.pm     |    3 +++
 lib/Test/Chimps/Smoker/SVN.pm |    6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit 3f377d2250e62075f4fc64d0f3dbf48dc82b07fd
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Fri Dec 4 22:09:30 2009 -0500

    Revert "File::Path provides rmtree, not remove_tree"
    
    Mea culpa -- File::Path advertises remove_tree in 2.06 and higher,
    which is what the Makefile asks for.
    
    This reverts commit ab07f41a10849950392367053a4e1c6174bb06d8.

diff --git a/lib/Test/Chimps/Smoker/SVN.pm b/lib/Test/Chimps/Smoker/SVN.pm
index 6d0f3e1..785639c 100644
--- a/lib/Test/Chimps/Smoker/SVN.pm
+++ b/lib/Test/Chimps/Smoker/SVN.pm
@@ -5,7 +5,7 @@ use warnings;
 use base qw(Test::Chimps::Smoker::Source);
 __PACKAGE__->mk_ro_accessors(qw/uri/);
 
-use File::Path qw(rmtree);
+use File::Path qw(remove_tree);
 
 sub revision_info {
     my $self = shift;
@@ -55,7 +55,7 @@ sub clean {
         or die "Can't call program `svn status .`: $!";
     while ( my $s = <$status_fh> ) {
         next unless my ($path) = ($s =~ /^\?\s*(.*)$/);
-        rmtree( File::Spec->catdir($self->directory, $path) );
+        remove_tree( File::Spec->catdir($self->directory, $path) );
     }
 }
 

commit 4a631ff486a89059df45944d59eebbb389f0648a
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Fri Dec 4 22:18:19 2009 -0500

    Return from ->smoke in the same directory we started

diff --git a/lib/Test/Chimps/Smoker.pm b/lib/Test/Chimps/Smoker.pm
index b349c33..3e4d284 100644
--- a/lib/Test/Chimps/Smoker.pm
+++ b/lib/Test/Chimps/Smoker.pm
@@ -160,6 +160,8 @@ sub smoke {
     my $self = shift;
     my $config = $self->config;
 
+    my $dir = Cwd::getcwd;
+
     my %args = validate_with(
         params => \@_,
         spec   => {
@@ -187,6 +189,7 @@ sub smoke {
     }
 
     $self->_smoke_n_times($iterations, $projects);
+    chdir $dir;
 }
 
 sub _validate_projects_opt {

commit d48756903e0654ef2fca3ee565add39e778d42d6
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Fri Dec 4 22:18:41 2009 -0500

    Revision 0 is possible, and (mostly) valid

diff --git a/lib/Test/Chimps/Smoker/SVN.pm b/lib/Test/Chimps/Smoker/SVN.pm
index 785639c..ee5aad2 100644
--- a/lib/Test/Chimps/Smoker/SVN.pm
+++ b/lib/Test/Chimps/Smoker/SVN.pm
@@ -36,7 +36,7 @@ sub committed_date {
 sub clone {
     my $self = shift;
 
-    $self->revision( ($self->revision_info)[0] - 1 ) unless $self->revision;
+    $self->revision( ($self->revision_info)[0] - 1 ) unless defined $self->revision;
     $self->run_cmd("checkout", "-r", $self->revision, $self->uri, $self->directory);
 }
 

-----------------------------------------------------------------------



More information about the Bps-public-commit mailing list