@@ -28,7 +28,7 @@ WriteMakefile( AUTHOR => 'Greg Sabino Mullane <greg@endpoint.com>', LICENSE => 'BSD', NO_META => 1, - clean => { FILES => 'log.bucardo.* *~ *.tmp outgoingmail.*' }, + clean => { FILES => 'log.bucardo.* *~ *.tmp outgoingmail.* bucardo_test_database*/' }, ); package MY; @@ -48,3 +48,10 @@ sub manifypods { $after .= qq{\t\$(NOECHO) \$(ECHO) Created Bucardo.pm.html and bucardo_ctl.html\n}; return shift->SUPER::manifypods(@_) . $after; } + +sub clean { + my $string = shift->SUPER::clean(@_); + $string =~ s{\t}{\tperl t/98-cleanup\.t\n\t}; + return $string; +} + Makefile.PL @@ -1,32 +1,27 @@ -#!/usr/bin/perl -- -*-cperl-*- +#!perl -## Cleanup all test remnants +## Cleanup any mess we made use 5.008003; use strict; use warnings; -use DBI; -use Test::More tests => 5; -use lib 't','.'; -use BucardoTesting; - -use vars qw/$SQL $sth $t/; - -pass("*** Cleaning up Bucardo testing artifacts"); - -## Remove all temporary files -pass('Removed all temporary files'); -## *.bc.tmp - -## Remove all test databases -my $bct = BucardoTesting->new({name => 'cleanup'}); -$bct->drop_database('all'); -pass('Removed all test databases'); - -## Remove all test users -#$bct->drop_users('all'); -#pass('Removed all test users'); - -## Shutdown the helper program -pass('Shutdown the helper program'); +use Test::More tests => 1; + +for my $letter ('A'..'Z') { + my $dir = "bucardo_test_database_$letter"; + next if ! -d $dir; + my $pidfile = "$dir/postmaster.pid"; + next if ! -e $pidfile; + open my $fh, '<', $pidfile or die qq{Could not open "$pidfile": $!\n}; + <$fh> =~ /^(\d+)/ or die qq{File "$pidfile" did not start with a number!\n}; + my $pid = $1; + close $fh or die qq{Could not close "$pidfile": $!\n}; + kill 15 => $pid; + sleep 1; + if (kill 0 => $pid) { + kill 9 => $pid; + } +} + +pass 'Test databases are shut down'; t/98-cleanup.t eea9856befbb395eb42b45884374d22fdbe587f0 Greg Sabino Mullane greg@endpoint.com http://github.com/unilogic/bucardo/commit/35539751127f6ad74b82f9970baf388fdc622b5d 35539751127f6ad74b82f9970baf388fdc622b5d 2009-05-11T10:43:28-07:00 2009-05-11T10:43:28-07:00 Better cleanup of test databases. daf2d20e58fce138403eec9a81958237fbbc0a5e Greg Sabino Mullane greg@endpoint.com