diff options
Diffstat (limited to 'xt')
-rw-r--r-- | xt/imapd-mbsync-oimap.t | 5 | ||||
-rw-r--r-- | xt/imapd-validate.t | 9 | ||||
-rw-r--r-- | xt/perf-imap-list.t | 38 |
3 files changed, 8 insertions, 44 deletions
diff --git a/xt/imapd-mbsync-oimap.t b/xt/imapd-mbsync-oimap.t index d2237a24..b2cb8737 100644 --- a/xt/imapd-mbsync-oimap.t +++ b/xt/imapd-mbsync-oimap.t @@ -13,12 +13,13 @@ my $inboxdir = $ENV{GIANT_INBOX_DIR}; plan skip_all => "bad characters in $inboxdir" if $inboxdir =~ m![^\w\.\-/]!; my ($tmpdir, $for_destroy) = tmpdir(); my $cfg = "$tmpdir/cfg"; -my $mailbox = 'inbox.test'; +my $newsgroup = 'inbox.test'; +my $mailbox = "$newsgroup.1-50000"; { open my $fh, '>', $cfg or BAIL_OUT "open: $!"; print $fh <<EOF or BAIL_OUT "print: $!"; [publicinbox "test"] - newsgroup = $mailbox + newsgroup = $newsgroup address = oimap\@example.com inboxdir = $inboxdir EOF diff --git a/xt/imapd-validate.t b/xt/imapd-validate.t index f96ec879..b7b66d05 100644 --- a/xt/imapd-validate.t +++ b/xt/imapd-validate.t @@ -30,7 +30,7 @@ if ($test_tls && !-r $key || !-r $cert) { } my ($tmpdir, $for_destroy) = tmpdir(); my %OPT = qw(User u Password p); -my (%STARTTLS_OPT, %IMAPS_OPT, $td, $mailbox, $make_local_server); +my (%STARTTLS_OPT, %IMAPS_OPT, $td, $newsgroup, $mailbox, $make_local_server); if (($ENV{IMAP_TEST_URL} // '') =~ m!\Aimap://([^/]+)/(.+)\z!) { ($OPT{Server}, $mailbox) = ($1, $2); $OPT{Server} =~ s/:([0-9]+)\z// and $OPT{Port} = $1 + 0; @@ -39,6 +39,7 @@ if (($ENV{IMAP_TEST_URL} // '') =~ m!\Aimap://([^/]+)/(.+)\z!) { } else { require_mods(qw(DBD::SQLite)); $make_local_server->(); + $mailbox = "$newsgroup.1-50000"; } my %opts = (imap => \%OPT, 'imap+compress' => { %OPT, Compress => 1 }); @@ -124,15 +125,15 @@ BEGIN { $make_local_server = sub { require PublicInbox::Inbox; - $mailbox = 'inbox.test'; - my $ibx = { inboxdir => $inbox_dir, newsgroup => $mailbox }; + $newsgroup = 'inbox.test'; + my $ibx = { inboxdir => $inbox_dir, newsgroup => $newsgroup }; $ibx = PublicInbox::Inbox->new($ibx); my $pi_config = "$tmpdir/config"; { open my $fh, '>', $pi_config or die "open($pi_config): $!"; print $fh <<"" or die "print $pi_config: $!"; [publicinbox "test"] - newsgroup = $mailbox + newsgroup = $newsgroup inboxdir = $inbox_dir address = test\@example.com diff --git a/xt/perf-imap-list.t b/xt/perf-imap-list.t deleted file mode 100644 index 0f00f487..00000000 --- a/xt/perf-imap-list.t +++ /dev/null @@ -1,38 +0,0 @@ -#!perl -w -# Copyright (C) 2020 all contributors <meta@public-inbox.org> -# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt> -use Test::More; -use_ok 'PublicInbox::IMAP'; -use_ok 'PublicInbox::IMAPD'; -use PublicInbox::DS; -use Benchmark qw(:all); -my @n = map { { newsgroup => "inbox.comp.foo.bar.$_" } } (0..50000); -push @n, map { { newsgroup => "xobni.womp.foo.bar.$_" } } (0..50000); -my $self = { imapd => { grouplist => \@n } }; -my $n = scalar @n; -my $t = timeit(1, sub { - PublicInbox::IMAPD::refresh_inboxlist($self->{imapd}); -}); -diag timestr($t). "refresh $n inboxes"; - -open my $null, '>', '/dev/null' or BAIL_OUT "open: $!"; -my $ds = { sock => $null }; -my $nr = 200; -diag "starting benchmark..."; -my $cmd_list = \&PublicInbox::IMAP::cmd_list; -$t = timeit(1, sub { - for (0..$nr) { - my $res = $cmd_list->($self, 'tag', '', '*'); - PublicInbox::DS::write($ds, $res); - } -}); -diag timestr($t). "list all for $n inboxes $nr times"; -$nr = 20; -$t = timeit(1, sub { - for (0..$nr) { - my $res = $cmd_list->($self, 'tag', 'inbox.', '%'); - PublicInbox::DS::write($ds, $res); - } -}); -diag timestr($t). "list partial for $n inboxes $nr times"; -done_testing; |