about summary refs log tree commit homepage
path: root/t
diff options
context:
space:
mode:
authorEric Wong <e@yhbt.net>2020-08-20 20:24:39 +0000
committerEric Wong <e@yhbt.net>2020-08-20 21:11:04 +0000
commit6f5b7803c82c45105272802b818df684b87bd2ec (patch)
treee4c9b6bc5096b62a0074b03f65f266ee67ca0ce1 /t
parent3f3867da5e5ff10b941e942c9974ddbf1e5464c1 (diff)
downloadpublic-inbox-6f5b7803c82c45105272802b818df684b87bd2ec.tar.gz
We can reduce the need to edit the config file for NNTP group names
this way.
Diffstat (limited to 't')
-rw-r--r--t/imapd.t6
-rw-r--r--t/nntpd.t9
2 files changed, 5 insertions, 10 deletions
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);