From 0886c264b24b8bc7626e5a7eb59598b0229f066d Mon Sep 17 00:00:00 2001 From: "Eric Wong (Contractor, The Linux Foundation)" Date: Sun, 9 Jun 2019 04:31:05 +0000 Subject: www: support $INBOX/git/$EPOCH.git for v2 cloning And use it in manifest.js. To ease maintaining mirrors with grokmirror(1), we can accept a "git/" directory prefix before the epoch, and ".git" suffix after the epoch number. We maintain compatibility with "$INBOX/$EPOCH" cloning, of course, and it's still easier-to-type on the command-line. --- t/www_listing.t | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 't/www_listing.t') diff --git a/t/www_listing.t b/t/www_listing.t index 546c2f8f..2741e1b8 100644 --- a/t/www_listing.t +++ b/t/www_listing.t @@ -111,7 +111,7 @@ SKIP: { is(HTTP::Date::time2str($bare->{modified}), $h{'Last-Modified'}, 'modified field and Last-Modified header match'); - ok($manifest->{'/v2/0'}, 'v2 epoch appeared'); + ok($manifest->{'/v2/git/0.git'}, 'v2 epoch appeared'); skip 'skipping grok-pull integration test', 2 if !which('grok-pull'); @@ -130,7 +130,7 @@ mymanifest = $tmpdir/local-manifest.js.gz 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 $_"); } @@ -150,7 +150,7 @@ mymanifest = $tmpdir/per-inbox-manifest.js.gz 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/0 v2/1 v2/2)) { + for (qw(v2/git/0.git v2/git/1.git v2/git/2.git)) { ok(-d "$tmpdir/per-inbox/$_", "grok-pull created $_"); } } -- cgit v1.2.3-24-ge0c7