byterazor/qpsmtpd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better handling of testing temp files

Browse Source 
Rather than creating and ignoring a bunch of random files, create files in
t/tmp, ignored in .gitignore and cleaned up with 'make clean'
This commit is contained in:
Jared Johnson 2015-01-27 14:41:15 -06:00
parent 178c5f6884
commit 3bf1a7f48c
7 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitignore vendored
View File

@ -13,12 +13,7 @@ packaging/rpm/build/
*~ *~
*.bak *.bak
denysoft_greylist.dbm t/tmp
denysoft_greylist.dbm.lock
greylist.dbm
greylist.dbm.lock
greylisting.dbm
greylisting.dbm.lock
/cover_db/ /cover_db/
.last_cover_stats .last_cover_stats

2
Makefile.PL
View File

@ -39,7 +39,7 @@ WriteMakefile(
ABSTRACT => 'Flexible smtpd daemon written in Perl', ABSTRACT => 'Flexible smtpd daemon written in Perl',
AUTHOR => 'Ask Bjoern Hansen <ask@develooper.com>', AUTHOR => 'Ask Bjoern Hansen <ask@develooper.com>',
EXE_FILES => [qw(qpsmtpd qpsmtpd-forkserver qpsmtpd-prefork)], EXE_FILES => [qw(qpsmtpd qpsmtpd-forkserver qpsmtpd-prefork)],
clean => { FILES => [ '*.bak' ], }, clean => { FILES => [ '*.bak', 't/tmp' ], },
); );
sub MY::libscan { sub MY::libscan {

4
t/Test/Qpsmtpd.pm
View File

@ -11,6 +11,10 @@ use parent 'Qpsmtpd::SMTP';
use Qpsmtpd::Constants; use Qpsmtpd::Constants;
use Test::Qpsmtpd::Plugin; use Test::Qpsmtpd::Plugin;
if ( ! -d 't/tmp' ) {
mkdir 't/tmp' or warn "Could not create temporary testing directory:$!";
}
sub new_conn { sub new_conn {
ok(my $smtpd = __PACKAGE__->new(), "new"); ok(my $smtpd = __PACKAGE__->new(), "new");
ok( ok(

2
t/config/plugins
View File

@ -46,7 +46,7 @@ badrcptto
helo helo
sender_permitted_from sender_permitted_from
greylisting p0f genre,windows greylisting p0f genre,windows db_dir ./t/tmp
#auth/auth_checkpassword checkpw /usr/local/vpopmail/bin/vchkpw true /usr/bin/true #auth/auth_checkpassword checkpw /usr/local/vpopmail/bin/vchkpw true /usr/bin/true
#auth/auth_vpopmail #auth/auth_vpopmail

5
t/plugin_tests.t
View File

@ -7,8 +7,3 @@ my $qp = Test::Qpsmtpd->new();
$qp->run_plugin_tests($ARGV[0]); $qp->run_plugin_tests($ARGV[0]);
foreach my $file ("./t/config/greylist.dbm", "./t/config/greylist.dbm.lock") {
next if !-f $file;
unlink $file;
}

4
t/plugin_tests/greylisting
View File

@ -237,7 +237,7 @@ sub test_prune_db {
}; };
for my $test_class (@Qpsmtpd::DB::child_classes) { for my $test_class (@Qpsmtpd::DB::child_classes) {
delete $self->{db}; delete $self->{db};
eval { $self->db( class => $test_class ) }; eval { $self->db( class => $test_class, dir => 't/tmp' ) };
next if $@; next if $@;
$self->db->lock; $self->db->lock;
$self->db->flush; $self->db->flush;
@ -291,7 +291,7 @@ sub test_greylist {
my $rcpt = Qpsmtpd::Address->new( "<$test_email>" ); my $rcpt = Qpsmtpd::Address->new( "<$test_email>" );
for my $test_class (@Qpsmtpd::DB::child_classes) { for my $test_class (@Qpsmtpd::DB::child_classes) {
delete $self->{db}; delete $self->{db};
eval { $self->db( class => $test_class ) }; eval { $self->db( class => $test_class, dir => 't/tmp' ) };
if ( $@ ) { if ( $@ ) {
warn "Unable to test greylisting against $test_class: $@"; warn "Unable to test greylisting against $test_class: $@";
next; next;

5
t/qpsmtpd-db-file-dbm.t
View File

@ -6,9 +6,10 @@ use Test::More;
use lib 'lib'; # test lib/Qpsmtpd (vs site_perl) use lib 'lib'; # test lib/Qpsmtpd (vs site_perl)
use lib 't'; use lib 't';
use Test::Qpsmtpd;
use_ok('Qpsmtpd::DB::File::DBM'); use_ok('Qpsmtpd::DB::File::DBM');
my $db = Qpsmtpd::DB::File::DBM->new( name => 'testing' ); my $db = Qpsmtpd::DB::File::DBM->new( name => 'testing', dir => 't/tmp' );
__new(); __new();
__get(); __get();
__mget(); __mget();
@ -106,7 +107,7 @@ sub __untie_gotcha {
$db->flush; $db->flush;
$db->set( cut => 'itout' ); $db->set( cut => 'itout' );
$db->unlock; $db->unlock;
my $db2 = Qpsmtpd::DB::File::DBM->new( name => 'testing' ); my $db2 = Qpsmtpd::DB::File::DBM->new( name => 'testing', dir => 't/tmp' );
$db2->lock; $db2->lock;
is( $db2->get('cut'), 'itout', is( $db2->get('cut'), 'itout',
'get() in second db handle reads key set in first handle' ); 'get() in second db handle reads key set in first handle' );