diff options
author | Eric Wong <e@80x24.org> | 2016-04-25 09:50:01 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2016-04-25 09:50:32 +0000 |
commit | fe3d2447badd595df784541556311137b920b0a2 (patch) | |
tree | 6e37ab61406654680fd6757593cf810370055ecb /t | |
parent | 51c59323fffbfbb6ebc60f58da905e88ac323da5 (diff) | |
download | public-inbox-fe3d2447badd595df784541556311137b920b0a2.tar.gz |
By converting to using ourt git-fast-import-based Import module. This should allow us to be more easily installed.
Diffstat (limited to 't')
-rw-r--r-- | t/feed.t | 67 | ||||
-rw-r--r-- | t/html_index.t | 23 | ||||
-rw-r--r-- | t/mda.t | 18 |
3 files changed, 79 insertions, 29 deletions
@@ -3,8 +3,10 @@ use strict; use warnings; use Test::More; -use Email::Simple; +use Email::MIME; use PublicInbox::Feed; +use PublicInbox::Git; +use PublicInbox::Import; use PublicInbox::Config; use IPC::Run qw/run/; use File::Temp qw/tempdir/; @@ -15,15 +17,36 @@ sub string_feed { stream_to_string(PublicInbox::Feed::generate($_[0])); } +# ensure we are compatible with existing ssoma installations which +# do not use fast-import. We can probably remove this in 2018 +my %SSOMA; +sub rand_use ($) { + return 0 if $ENV{FAST}; + my $cmd = $_[0]; + my $x = $SSOMA{$cmd}; + unless ($x) { + $x = -1; + foreach my $p (split(':', $ENV{PATH})) { + -x "$p/$cmd" or next; + $x = 1; + last; + } + $SSOMA{$cmd} = $x; + } + (($x > 0 && (int(rand(10)) % 2) == 1) || $x < 0); +} + my $tmpdir = tempdir('pi-feed-XXXXXX', TMPDIR => 1, CLEANUP => 1); my $git_dir = "$tmpdir/gittest"; +my $git = PublicInbox::Git->new($git_dir); +my $im = PublicInbox::Import->new($git, 'testbox', 'test@example'); { is(0, system(qw(git init -q --bare), $git_dir), "git init"); local $ENV{GIT_DIR} = $git_dir; foreach my $i (1..6) { - my $simple = Email::Simple->new(<<EOF); + my $mime = Email::MIME->new(<<EOF); From: ME <me\@example.com> To: U <u\@example.com> Message-Id: <$i\@example.com> @@ -53,10 +76,16 @@ msg $i keep me EOF - my $str = $simple->as_string; - run(['ssoma-mda', $git_dir], \$str) or - die "mda failed: $?\n"; + if (rand_use('ssoma-mda')) { + $im->done; + my $str = $mime->as_string; + run(['ssoma-mda', $git_dir], \$str) or + die "mda failed: $?\n"; + } else { + like($im->add($mime), qr/\A:\d+/, 'added'); + } } + $im->done; } # spam check @@ -84,13 +113,7 @@ EOF # add a new spam message my $spam; { - my $pid = open(my $pipe, "|-"); - defined $pid or die "fork/pipe failed: $!\n"; - if ($pid == 0) { - exec("ssoma-mda", $git_dir); - } - - $spam = Email::Simple->new(<<EOF); + $spam = Email::MIME->new(<<EOF); From: SPAMMER <spammer\@example.com> To: U <u\@example.com> Message-Id: <this-is-spam\@example.com> @@ -98,8 +121,19 @@ Subject: SPAM!!!!!!!! Date: Thu, 01 Jan 1970 00:00:00 +0000 EOF - print $pipe $spam->as_string or die "print failed: $!\n"; - close $pipe or die "close pipe failed: $!\n"; + if (rand_use('ssoma-mda')) { + my $pid = open(my $pipe, "|-"); + defined $pid or die "fork/pipe failed: $!"; + if ($pid == 0) { + exec("ssoma-mda", $git_dir); + } + + print $pipe $spam->as_string or die "print failed: $!"; + close $pipe or die "close pipe failed: $!"; + } else { + $im->add($spam); + $im->done; + } } # check spam shows up @@ -118,10 +152,13 @@ EOF } # nuke spam - { + if (rand_use('ssoma-rm')) { my $spam_str = $spam->as_string; run(["ssoma-rm", $git_dir], \$spam_str) or die "ssoma-rm failed: $?\n"; + } else { + $im->remove($spam); + $im->done; } # spam no longer shows up diff --git a/t/html_index.t b/t/html_index.t index adbadaf4..6896eb41 100644 --- a/t/html_index.t +++ b/t/html_index.t @@ -3,11 +3,15 @@ use strict; use warnings; use Test::More; -use Email::Simple; +use Email::MIME; use PublicInbox::Feed; +use PublicInbox::Git; +use PublicInbox::Import; use File::Temp qw/tempdir/; my $tmpdir = tempdir('pi-http-XXXXXX', TMPDIR => 1, CLEANUP => 1); my $git_dir = "$tmpdir/gittest"; +my $git = PublicInbox::Git->new($git_dir); +my $im = PublicInbox::Import->new($git, 'tester', 'test@example'); # setup { @@ -15,19 +19,18 @@ my $git_dir = "$tmpdir/gittest"; my $prev = ""; foreach my $i (1..6) { - local $ENV{GIT_DIR} = $git_dir; - my $pid = open(my $pipe, "|-"); - defined $pid or die "fork/pipe failed: $!\n"; - if ($pid == 0) { - exec("ssoma-mda", $git_dir); - } + # my $pid = open(my $pipe, "|-"); + # defined $pid or die "fork/pipe failed: $!\n"; + # if ($pid == 0) { + # exec("ssoma-mda", $git_dir); + # } my $mid = "<$i\@example.com>"; my $mid_line = "Message-ID: $mid"; if ($prev) { $mid_line .= "In-Reply-To: $prev"; } $prev = $mid; - my $simple = Email::Simple->new(<<EOF); + my $mime = Email::MIME->new(<<EOF); From: ME <me\@example.com> To: U <u\@example.com> $mid_line @@ -43,9 +46,9 @@ msg $i keep me EOF - print $pipe $simple->as_string or die "print failed: $!\n"; - close $pipe or die "close pipe failed: $!\n"; + like($im->add($mime), qr/\A:\d+\z/, 'inserted message'); } + $im->done; } # check HTML index @@ -8,6 +8,7 @@ use Email::Filter; use File::Temp qw/tempdir/; use Cwd; use IPC::Run qw(run); +use PublicInbox::MID qw(mid2path); my $mda = "blib/script/public-inbox-mda"; my $learn = "blib/script/public-inbox-learn"; @@ -54,7 +55,13 @@ local $ENV{GIT_COMMITTER_NAME} = eval { close $fh; my $msg = Email::Filter->new(data => $str); $msg = Email::MIME->new($msg->simple->as_string); - my ($author, $email, $date) = PublicInbox::MDA->author_info($msg); + + my $from = $msg->header('From'); + my @from = Email::Address->parse($from); + my $author = $from[0]->name; + my $email = $from[0]->address; + my $date = $msg ->header('Date'); + is('Eléanor', encode('us-ascii', my $tmp = $author, Encode::HTMLCREF), 'HTML conversion is correct'); @@ -174,7 +181,8 @@ EOF { # deliver the spam message, first run([$mda], \$in); - my $msg = `ssoma cat $mid $maindir`; + my $path = mid2path($mid); + my $msg = `git --git-dir=$maindir cat-file blob HEAD:$path`; like($msg, qr/\Q$mid\E/, "message delivered"); # now train it @@ -212,7 +220,8 @@ EOF run([$learn, "ham"], \$in); is($?, 0, "learned ham without failure"); - my $msg = `ssoma cat $mid $maindir`; + my $path = mid2path($mid); + my $msg = `git --git-dir=$maindir cat-file blob HEAD:$path`; like($msg, qr/\Q$mid\E/, "ham message delivered"); run([$learn, "ham"], \$in); is($?, 0, "learned ham idempotently "); @@ -251,7 +260,8 @@ EOF $in = $mime->as_string; run([$learn, "ham"], \$in); is($?, 0, "learned ham without failure"); - $msg = `ssoma cat $mid $maindir`; + my $path = mid2path($mid); + $msg = `git --git-dir=$maindir cat-file blob HEAD:$path`; like($msg, qr/<\Q$mid\E>/, "ham message delivered"); unlike($msg, qr/<html>/i, '<html> filtered'); } |