use PublicInbox::Spawn qw(which);
use File::Temp qw/tempdir/;
require './t/common.perl';
-my @mods = qw(URI::Escape Plack::Builder IPC::Run Digest::SHA HTTP::Tiny
- IO::Compress::Gzip IO::Uncompress::Gunzip Net::HTTP);
+my @mods = qw(URI::Escape Plack::Builder IPC::Run Digest::SHA
+ IO::Compress::Gzip IO::Uncompress::Gunzip HTTP::Tiny);
foreach my $mod (@mods) {
eval("require $mod") or plan skip_all => "$mod missing for $0";
}
-use_ok 'PublicInbox::WwwListing';
+
+require PublicInbox::WwwListing;
+my $json = eval { PublicInbox::WwwListing::_json() };
+plan skip_all => "JSON module missing: $@" if $@;
+
use_ok 'PublicInbox::Git';
my $fi_data = './t/git.fast-import-data';
like(PublicInbox::WwwListing::fingerprint($bare), qr/\A[a-f0-9]{40}\z/,
'got fingerprint with non-empty repo');
+sub tiny_test {
+ my ($host, $port) = @_;
+ my $http = HTTP::Tiny->new;
+ my $res = $http->get("http://$host:$port/manifest.js.gz");
+ is($res->{status}, 200, 'got manifest');
+ my $tmp;
+ IO::Uncompress::Gunzip::gunzip(\(delete $res->{content}) => \$tmp);
+ unlike($tmp, qr/"modified":\s*"/, 'modified is an integer');
+ my $manifest = $json->decode($tmp);
+ ok(my $clone = $manifest->{'/alt'}, '/alt in manifest');
+ is($clone->{owner}, 'lorelei', 'owner set');
+ is($clone->{reference}, '/bare', 'reference detected');
+ is($clone->{description}, "we're all clones", 'description read');
+ ok(my $bare = $manifest->{'/bare'}, '/bare in manifest');
+ is($bare->{description}, 'Unnamed repository',
+ 'missing $GIT_DIR/description fallback');
+
+ like($bare->{fingerprint}, qr/\A[a-f0-9]{40}\z/, 'fingerprint');
+ is($clone->{fingerprint}, $bare->{fingerprint}, 'fingerprint matches');
+ is(HTTP::Date::time2str($bare->{modified}),
+ $res->{headers}->{'last-modified'},
+ 'modified field and Last-Modified header match');
+
+ ok(my $v2epoch0 = $manifest->{'/v2/git/0.git'}, 'v2 epoch 0 appeared');
+ like($v2epoch0->{description}, qr/ \[epoch 0\]\z/,
+ 'epoch 0 in description');
+ ok(my $v2epoch1 = $manifest->{'/v2/git/1.git'}, 'v2 epoch 1 appeared');
+ like($v2epoch1->{description}, qr/ \[epoch 1\]\z/,
+ 'epoch 1 in description');
+}
+
my $pid;
END { kill 'TERM', $pid if defined $pid };
SKIP: {
- my $json = eval { PublicInbox::WwwListing::_json() };
- skip "JSON module missing: $@", 1 if $@;
my $err = "$tmpdir/stderr.log";
my $out = "$tmpdir/stdout.log";
my $alt = "$tmpdir/alt.git";
my $cfgfile = "$tmpdir/config";
my $v2 = "$tmpdir/v2";
my $httpd = 'blib/script/public-inbox-httpd';
- use IO::Socket::INET;
- my %opts = (
- LocalAddr => '127.0.0.1',
- ReuseAddr => 1,
- Proto => 'tcp',
- Type => SOCK_STREAM,
- Listen => 1024,
- );
- my $sock = IO::Socket::INET->new(%opts);
+ my $sock = tcp_server();
ok($sock, 'sock created');
my ($host, $port) = ($sock->sockhost, $sock->sockport);
my @clone = qw(git clone -q -s --bare);
open $fh, '>', $cfgfile or die;
print $fh <<"" or die;
[publicinbox "bare"]
- mainrepo = $bare->{git_dir}
+ inboxdir = $bare->{git_dir}
url = http://$host/bare
address = bare\@example.com
[publicinbox "alt"]
- mainrepo = $alt
+ inboxdir = $alt
url = http://$host/alt
address = alt\@example.com
[publicinbox "v2"]
- mainrepo = $v2
+ inboxdir = $v2
url = http://$host/v2
address = v2\@example.com
my $cmd = [ $httpd, "--stdout=$out", "--stderr=$err" ];
$pid = spawn_listener($env, $cmd, [$sock]);
$sock = undef;
- my $http = Net::HTTP->new(Host => "$host:$port");
- $http->write_request(GET => '/manifest.js.gz');
- my ($code, undef, %h) = $http->read_response_headers;
- is($code, 200, 'got manifest');
- my $tmp;
- my $body = '';
- while (1) {
- my $n = $http->read_entity_body(my $buf, 65536);
- die unless defined $n;
- last if $n == 0;
- $body .= $buf;
- }
- IO::Uncompress::Gunzip::gunzip(\$body => \$tmp);
- my $manifest = $json->decode($tmp);
- ok(my $clone = $manifest->{'/alt'}, '/alt in manifest');
- is($clone->{owner}, 'lorelei', 'owner set');
- is($clone->{reference}, '/bare', 'reference detected');
- is($clone->{description}, "we're all clones", 'description read');
- ok(my $bare = $manifest->{'/bare'}, '/bare in manifest');
- is($bare->{description}, 'Unnamed repository',
- 'missing $GIT_DIR/description fallback');
- like($bare->{fingerprint}, qr/\A[a-f0-9]{40}\z/, 'fingerprint');
- is($clone->{fingerprint}, $bare->{fingerprint}, 'fingerprint matches');
-
- is(HTTP::Date::time2str($bare->{modified}), $h{'Last-Modified'},
- 'modified field and Last-Modified header match');
-
- ok($manifest->{'/v2/0'}, 'v2 epoch appeared');
+ tiny_test($host, $port);
skip 'skipping grok-pull integration test', 2 if !which('grok-pull');
system(qw(grok-pull -c), "$tmpdir/repos.conf");
is($? >> 8, 127, 'grok-pull exit code as expected');
- for (qw(alt bare v2/0 v2/1 v2/2)) {
+ for (qw(alt bare v2/git/0.git v2/git/1.git v2/git/2.git)) {
ok(-d "$tmpdir/mirror/$_", "grok-pull created $_");
}
+
+ # support per-inbox manifests, handy for v2:
+ # /$INBOX/v2/manifest.js.gz
+ open $fh, '>', "$tmpdir/per-inbox.conf" or die;
+ print $fh <<"" or die;
+# You can pull from multiple grok mirrors, just create
+# a separate section for each mirror. The name can be anything.
+[v2]
+site = http://$host:$port
+manifest = http://$host:$port/v2/manifest.js.gz
+toplevel = $tmpdir/per-inbox
+mymanifest = $tmpdir/per-inbox-manifest.js.gz
+
+ close $fh or die;
+ ok(mkdir("$tmpdir/per-inbox"), 'prepare single-v2-inbox mirror');
+ system(qw(grok-pull -c), "$tmpdir/per-inbox.conf");
+ is($? >> 8, 127, 'grok-pull exit code as expected');
+ for (qw(v2/git/0.git v2/git/1.git v2/git/2.git)) {
+ ok(-d "$tmpdir/per-inbox/$_", "grok-pull created $_");
+ }
}
done_testing();