X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=blobdiff_plain;f=t%2Flei-mirror.t;h=dfd35e1af5cae6a1866b64ae24d1c35d32c33575;hp=cbe300dac047fb9f412eb29f79752a66d92515c2;hb=0b15dfc58ceaecdcb1c9285c3ad55813006c8338;hpb=04b73104416e4734b3a01e47525119cac867065a

diff --git a/t/lei-mirror.t b/t/lei-mirror.t
index cbe300da..dfd35e1a 100644
--- a/t/lei-mirror.t
+++ b/t/lei-mirror.t
@@ -2,8 +2,7 @@
 # Copyright (C) 2020-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict; use v5.10.1; use PublicInbox::TestCommon;
-require_git 2.6;
-require_mods(qw(DBD::SQLite Search::Xapian));
+require_mods(qw(-httpd lei));
 my $sock = tcp_server();
 my ($tmpdir, $for_destroy) = tmpdir();
 my $http = 'http://'.tcp_host_port($sock);
@@ -13,29 +12,52 @@ my $td = start_script($cmd, { PI_CONFIG => $cfg_path }, { 3 => $sock });
 test_lei({ tmpdir => $tmpdir }, sub {
 	my $home = $ENV{HOME};
 	my $t1 = "$home/t1-mirror";
-	ok($lei->('add-external', $t1, '--mirror', "$http/t1/"), '--mirror v1');
+	lei_ok('add-external', $t1, '--mirror', "$http/t1/", \'--mirror v1');
 	ok(-f "$t1/public-inbox/msgmap.sqlite3", 't1-mirror indexed');
 
-	ok($lei->('ls-external'), 'ls-external');
+	lei_ok('ls-external');
 	like($lei_out, qr!\Q$t1\E!, 't1 added to ls-externals');
 
 	my $t2 = "$home/t2-mirror";
-	ok($lei->('add-external', $t2, '--mirror', "$http/t2/"), '--mirror v2');
+	lei_ok('add-external', $t2, '--mirror', "$http/t2/", \'--mirror v2');
 	ok(-f "$t2/msgmap.sqlite3", 't2-mirror indexed');
 
-	ok($lei->('ls-external'), 'ls-external');
+	lei_ok('ls-external');
 	like($lei_out, qr!\Q$t2\E!, 't2 added to ls-externals');
 
-	ok(!$lei->('add-external', $t2, '--mirror', "$http/t2/"),
+	ok(!lei('add-external', $t2, '--mirror', "$http/t2/"),
 		'--mirror fails if reused') or diag "$lei_err.$lei_out = $?";
 
-	ok($lei->('ls-external'), 'ls-external');
+	ok(!lei('add-external', "$home/t2\nnewline", '--mirror', "$http/t2/"),
+		'--mirror fails on newline');
+	like($lei_err, qr/`\\n' not allowed/, 'newline noted in error');
+
+	lei_ok('ls-external');
 	like($lei_out, qr!\Q$t2\E!, 'still in ls-externals');
+	unlike($lei_out, qr!\Qnewline\E!, 'newline entry not added');
 
-	ok(!$lei->('add-external', "$t2-fail", '-Lmedium'), '--mirror v2');
+	ok(!lei('add-external', "$t2-fail", '-Lmedium'), '--mirror v2');
 	ok(!-d "$t2-fail", 'destination not created on failure');
-	ok($lei->('ls-external'), 'ls-external');
+	lei_ok('ls-external');
 	unlike($lei_out, qr!\Q$t2-fail\E!, 'not added to ls-external');
+
+	my %phail = (
+		HTTPS => 'https://public-inbox.org/' . 'phail',
+		ONION => 'http://7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.onion/' . 'phail,'
+	);
+	for my $t (qw(HTTPS ONION)) {
+	SKIP: {
+		my $k = "TEST_LEI_EXTERNAL_$t";
+		$ENV{$k} or skip "$k unset", 1;
+		my $url = $phail{$t};
+		my $dir = "phail-$t";
+		ok(!lei(qw(add-external -Lmedium --mirror),
+			$url, $dir), '--mirror non-existent v2');
+		is($? >> 8, 22, 'curl 404');
+		ok(!-d $dir, 'directory not created');
+		unlike($lei_err, qr/# mirrored/, 'no success message');
+	} # SKIP
+	} # for
 });
 
 ok($td->kill, 'killed -httpd');