[Bps-public-commit] r11275 - in SVN-PropDB: .

[jesse at bestpractical.com]

Author: jesse
Date: Sun Mar 30 16:51:12 2008
New Revision: 11275

Modified:
   SVN-PropDB/   (props changed)
   SVN-PropDB/lib/Prophet/Test.pm

Log:
 r28803 at 68-247-16-135:  jesse | 2008-03-30 10:50:42 -1000
 cleanup code


Modified: SVN-PropDB/lib/Prophet/Test.pm
==============================================================================
--- SVN-PropDB/lib/Prophet/Test.pm	(original)
+++ SVN-PropDB/lib/Prophet/Test.pm	Sun Mar 30 16:51:12 2008
@@ -59,7 +59,7 @@
 }
 
 sub _mk_cmp_closure {
-    my ($exp, $err, $negate) = @_;
+    my ($exp, $err) = @_;
     my $line = 0;
     sub {
 	my $output = shift;
@@ -93,8 +93,8 @@
     my @cmd = ($^X, (map { "-I$_" } @INC), 'bin/'.$script);
 
     my $ret = run3 [@cmd, @$arg], undef,
-	_mk_cmp_closure($exp_stdout, $stdout_err,0), # stdout
-	_mk_cmp_closure($exp_stderr, $stdout_err,0); # stderr
+	_mk_cmp_closure($exp_stdout, $stdout_err), # stdout
+	_mk_cmp_closure($exp_stderr, $stdout_err); # stderr
 	
     if (@$stdout_err) {
     	@_ = (0, join(' ', "$msg:", $script, @$arg));
@@ -175,6 +175,12 @@
 sub as_charlie(&) { as_user( charlie => shift) }
 sub as_david(&) { as_user( david => shift) }
 
+use File::Path 'rmtree';
+END {
+    for (qw(alice bob charlie david)) {
+        as_user( $_, sub { rmtree [ $ENV{'PROPHET_REPO'} ] } );
+    }
+}
 
 
 1;