about summary refs log tree commit homepage
path: root/t/watch_maildir.t
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2020-12-08 21:21:27 +0000
committerEric Wong <e@80x24.org>2020-12-09 21:13:34 +0000
commit0d38f65c490466837ae091afa7a7b6f59d04ce7c (patch)
tree8c838c12ce3c28ef1c15a15dd6584e0d0d831a34 /t/watch_maildir.t
parent416d1c3f6d5e5a857760ffc1b679e86a070bdbd4 (diff)
downloadpublic-inbox-0d38f65c490466837ae091afa7a7b6f59d04ce7c.tar.gz
{pi_config} may be confused with the documented `PI_CONFIG'
environment variable, and we'll favor vowel-removal to be
consistent with our usage of object references.

The `pi_' prefix may stay in some places, for now; since a
separate namespace may come into this codebase for local/private
client-tooling.

For InboxIdle, we'll also remove an invalid comment about
holding a reference to the PublicInbox::Config object, too.
Diffstat (limited to 't/watch_maildir.t')
-rw-r--r--t/watch_maildir.t26
1 files changed, 13 insertions, 13 deletions
diff --git a/t/watch_maildir.t b/t/watch_maildir.t
index ae53caf9..c948b41b 100644
--- a/t/watch_maildir.t
+++ b/t/watch_maildir.t
@@ -34,13 +34,13 @@ my $sem = PublicInbox::Emergency->new($spamdir); # create dirs
 {
         my @w;
         local $SIG{__WARN__} = sub { push @w, @_ };
-        my $config = PublicInbox::Config->new(\<<EOF);
+        my $cfg = PublicInbox::Config->new(\<<EOF);
 $cfgpfx.address=$addr
 $cfgpfx.inboxdir=$git_dir
 $cfgpfx.watch=maildir:$spamdir
 publicinboxlearn.watchspam=maildir:$spamdir
 EOF
-        my $wm = PublicInbox::Watch->new($config);
+        my $wm = PublicInbox::Watch->new($cfg);
         is(scalar grep(/is a spam folder/, @w), 1, 'got warning about spam');
         is_deeply($wm->{mdmap}, { "$spamdir/cur" => 'watchspam' },
                 'only got the spam folder to watch');
@@ -61,8 +61,8 @@ EOF
         close $fh or BAIL_OUT $!;
 }
 
-my $config = PublicInbox::Config->new($cfg_path);
-PublicInbox::Watch->new($config)->scan('full');
+my $cfg = PublicInbox::Config->new($cfg_path);
+PublicInbox::Watch->new($cfg)->scan('full');
 my $git = PublicInbox::Git->new($git_dir);
 my @list = $git->qx(qw(rev-list refs/heads/master));
 is(scalar @list, 1, 'one revision in rev-list');
@@ -79,7 +79,7 @@ my $write_spam = sub {
 };
 $write_spam->();
 is(unlink(glob("$maildir/new/*")), 1, 'unlinked old spam');
-PublicInbox::Watch->new($config)->scan('full');
+PublicInbox::Watch->new($cfg)->scan('full');
 @list = $git->qx(qw(rev-list refs/heads/master));
 is(scalar @list, 2, 'two revisions in rev-list');
 @list = $git->qx(qw(ls-tree -r --name-only refs/heads/master));
@@ -93,7 +93,7 @@ To unsubscribe from this list: send the line "unsubscribe git" in
 the body of a message to majordomo\@vger.kernel.org
 More majordomo info at  http://vger.kernel.org/majordomo-info.html\n);
         PublicInbox::Emergency->new($maildir)->prepare(\$msg);
-        PublicInbox::Watch->new($config)->scan('full');
+        PublicInbox::Watch->new($cfg)->scan('full');
         @list = $git->qx(qw(ls-tree -r --name-only refs/heads/master));
         is(scalar @list, 1, 'tree has one file');
         my $mref = $git->cat_file('HEAD:'.$list[0]);
@@ -101,7 +101,7 @@ More majordomo info at  http://vger.kernel.org/majordomo-info.html\n);
 
         is(unlink(glob("$maildir/new/*")), 1, 'unlinked spam');
         $write_spam->();
-        PublicInbox::Watch->new($config)->scan('full');
+        PublicInbox::Watch->new($cfg)->scan('full');
         @list = $git->qx(qw(ls-tree -r --name-only refs/heads/master));
         is(scalar @list, 0, 'tree is empty');
         @list = $git->qx(qw(rev-list refs/heads/master));
@@ -115,10 +115,10 @@ More majordomo info at  http://vger.kernel.org/majordomo-info.html\n);
         my $fail_path = "$fail_bin:$ENV{PATH}"; # for spamc ham mock
         local $ENV{PATH} = $fail_path;
         PublicInbox::Emergency->new($maildir)->prepare(\$msg);
-        $config->{'publicinboxwatch.spamcheck'} = 'spamc';
+        $cfg->{'publicinboxwatch.spamcheck'} = 'spamc';
         {
                 local $SIG{__WARN__} = sub {}; # quiet spam check warning
-                PublicInbox::Watch->new($config)->scan('full');
+                PublicInbox::Watch->new($cfg)->scan('full');
         }
         @list = $git->qx(qw(ls-tree -r --name-only refs/heads/master));
         is(scalar @list, 0, 'tree has no files spamc checked');
@@ -131,9 +131,9 @@ More majordomo info at  http://vger.kernel.org/majordomo-info.html\n);
         my $main_path = "$main_bin:$ENV{PATH}"; # for spamc ham mock
         local $ENV{PATH} = $main_path;
         PublicInbox::Emergency->new($maildir)->prepare(\$msg);
-        $config->{'publicinboxwatch.spamcheck'} = 'spamc';
+        $cfg->{'publicinboxwatch.spamcheck'} = 'spamc';
         @list = $git->qx(qw(ls-tree -r --name-only refs/heads/master));
-        PublicInbox::Watch->new($config)->scan('full');
+        PublicInbox::Watch->new($cfg)->scan('full');
         @list = $git->qx(qw(ls-tree -r --name-only refs/heads/master));
         is(scalar @list, 1, 'tree has one file after spamc checked');
 
@@ -166,9 +166,9 @@ More majordomo info at  http://vger.kernel.org/majordomo-info.html\n);
                 $delivered++;
         };
         PublicInbox::DS->Reset;
-        my $ii = PublicInbox::InboxIdle->new($config);
+        my $ii = PublicInbox::InboxIdle->new($cfg);
         my $obj = bless \$cb, 'PublicInbox::TestCommon::InboxWakeup';
-        $config->each_inbox(sub { $_[0]->subscribe_unlock('ident', $obj) });
+        $cfg->each_inbox(sub { $_[0]->subscribe_unlock('ident', $obj) });
         PublicInbox::DS->SetPostLoopCallback(sub { $delivered == 0 });
 
         # wait for -watch to setup inotify watches