X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fwatch_maildir.t;h=e0719f541ac76c7fcc0496db0b90618271cf08da;hb=4eee5af6011cc8cdefb66c9729952c7eff5c0b0b;hp=c948b41b235334bffbe5a47c06f57866c64f1426;hpb=8862c33ae93eea1af6246cd3c7a81e0a122186bf;p=public-inbox.git

diff --git a/t/watch_maildir.t b/t/watch_maildir.t
index c948b41b..e0719f54 100644
--- a/t/watch_maildir.t
+++ b/t/watch_maildir.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use Test::More;
@@ -15,6 +15,7 @@ use_ok 'PublicInbox::Watch';
 use_ok 'PublicInbox::Emergency';
 my $cfgpfx = "publicinbox.test";
 my $addr = 'test-public@example.com';
+my $default_branch = PublicInbox::Import::default_branch;
 PublicInbox::Import::init_bare($git_dir);
 
 my $msg = <<EOF;
@@ -64,7 +65,7 @@ EOF
 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));
+my @list = $git->qx('rev-list', $default_branch);
 is(scalar @list, 1, 'one revision in rev-list');
 
 my $write_spam = sub {
@@ -80,9 +81,9 @@ my $write_spam = sub {
 $write_spam->();
 is(unlink(glob("$maildir/new/*")), 1, 'unlinked old spam');
 PublicInbox::Watch->new($cfg)->scan('full');
-@list = $git->qx(qw(rev-list refs/heads/master));
+@list = $git->qx('rev-list', $default_branch);
 is(scalar @list, 2, 'two revisions in rev-list');
-@list = $git->qx(qw(ls-tree -r --name-only refs/heads/master));
+@list = $git->qx('ls-tree', '-r', '--name-only', $default_branch);
 is(scalar @list, 0, 'tree is empty');
 is(unlink(glob("$spamdir/cur/*")), 1, 'unlinked trained spam');
 
@@ -94,7 +95,7 @@ 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($cfg)->scan('full');
-	@list = $git->qx(qw(ls-tree -r --name-only refs/heads/master));
+	@list = $git->qx('ls-tree', '-r', '--name-only', $default_branch);
 	is(scalar @list, 1, 'tree has one file');
 	my $mref = $git->cat_file('HEAD:'.$list[0]);
 	like($$mref, qr/something\n\z/s, 'message scrubbed on import');
@@ -102,9 +103,9 @@ 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($cfg)->scan('full');
-	@list = $git->qx(qw(ls-tree -r --name-only refs/heads/master));
+	@list = $git->qx('ls-tree', '-r', '--name-only', $default_branch);
 	is(scalar @list, 0, 'tree is empty');
-	@list = $git->qx(qw(rev-list refs/heads/master));
+	@list = $git->qx('rev-list', $default_branch);
 	is(scalar @list, 4, 'four revisions in rev-list');
 	is(unlink(glob("$spamdir/cur/*")), 1, 'unlinked trained spam');
 }
@@ -120,7 +121,7 @@ More majordomo info at  http://vger.kernel.org/majordomo-info.html\n);
 		local $SIG{__WARN__} = sub {}; # quiet spam check warning
 		PublicInbox::Watch->new($cfg)->scan('full');
 	}
-	@list = $git->qx(qw(ls-tree -r --name-only refs/heads/master));
+	@list = $git->qx('ls-tree', '-r', '--name-only', $default_branch);
 	is(scalar @list, 0, 'tree has no files spamc checked');
 	is(unlink(glob("$maildir/new/*")), 1);
 }
@@ -132,16 +133,16 @@ More majordomo info at  http://vger.kernel.org/majordomo-info.html\n);
 	local $ENV{PATH} = $main_path;
 	PublicInbox::Emergency->new($maildir)->prepare(\$msg);
 	$cfg->{'publicinboxwatch.spamcheck'} = 'spamc';
-	@list = $git->qx(qw(ls-tree -r --name-only refs/heads/master));
+	@list = $git->qx('ls-tree', '-r', '--name-only', $default_branch);
 	PublicInbox::Watch->new($cfg)->scan('full');
-	@list = $git->qx(qw(ls-tree -r --name-only refs/heads/master));
+	@list = $git->qx('ls-tree', '-r', '--name-only', $default_branch);
 	is(scalar @list, 1, 'tree has one file after spamc checked');
 
 	# XXX: workaround some weird caching/memoization in cat-file,
 	# shouldn't be an issue in real-world use, though...
 	$git = PublicInbox::Git->new($git_dir);
 
-	my $mref = $git->cat_file('refs/heads/master:'.$list[0]);
+	my $mref = $git->cat_file($default_branch.':'.$list[0]);
 	like($$mref, qr/something\n\z/s, 'message scrubbed on import');
 }
 
@@ -199,7 +200,7 @@ More majordomo info at  http://vger.kernel.org/majordomo-info.html\n);
 
 	$em->commit; # wake -watch up
 	diag 'waiting for -watch to import new message';
-	PublicInbox::DS->EventLoop;
+	PublicInbox::DS::event_loop();
 	$wm->kill;
 	$wm->join;
 	$ii->close;