From 6f5b7803c82c45105272802b818df684b87bd2ec Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Thu, 20 Aug 2020 20:24:39 +0000 Subject: init: support --newsgroup option We can reduce the need to edit the config file for NNTP group names this way. --- t/imapd.t | 6 ++---- t/nntpd.t | 9 +++------ 2 files changed, 5 insertions(+), 10 deletions(-) (limited to 't') diff --git a/t/imapd.t b/t/imapd.t index 6cfced41..4d627af7 100644 --- a/t/imapd.t +++ b/t/imapd.t @@ -39,11 +39,9 @@ for my $V (@V) { my $url = "http://example.com/i$V"; my $inboxdir = "$tmpdir/$name"; my $folder = "inbox.i$V"; - my $cmd = ['-init', "-V$V", "-L$level", $name, $inboxdir, $url, $addr]; + my $cmd = ['-init', "-V$V", "-L$level", "--ng=$folder", + $name, $inboxdir, $url, $addr]; run_script($cmd) or BAIL_OUT("init $name"); - xsys(qw(git config), "--file=$ENV{HOME}/.public-inbox/config", - "publicinbox.$name.newsgroup", $folder) == 0 or - BAIL_OUT("setting newsgroup $V"); if ($V == 1) { xsys(qw(git config), "--file=$ENV{HOME}/.public-inbox/config", 'publicinboxmda.spamcheck', 'none') == 0 or diff --git a/t/nntpd.t b/t/nntpd.t index b9b9a63d..74e21a41 100644 --- a/t/nntpd.t +++ b/t/nntpd.t @@ -46,14 +46,11 @@ my $ibx = { $ibx = PublicInbox::Inbox->new($ibx); { local $ENV{HOME} = $home; - my @cmd = ('-init', $group, $inboxdir, 'http://example.com/', $addr); - push @cmd, "-V$version", '-Lbasic'; + my @cmd = ('-init', $group, $inboxdir, 'http://example.com/', $addr, + "-V$version", '-Lbasic', '--newsgroup', $group); ok(run_script(\@cmd), 'init OK'); - is(xsys(qw(git config), "--file=$home/.public-inbox/config", - "publicinbox.$group.newsgroup", $group), - 0, 'enabled newsgroup'); - my $len; + my $len; $ibx = PublicInbox::InboxWritable->new($ibx); my $im = $ibx->importer(0); -- cgit v1.2.3-24-ge0c7