X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fgit.t;h=445ef248d71309d4d345ce4c78ce8492d67b8880;hb=b41c19abcf0b0ac8a5f55678bfb0058ad50b3179;hp=5069ae2c42c68202aea2a0120dbfbd908e86a9a3;hpb=59c946a014f34cd90621b1fb3b30af99ba80bf61;p=public-inbox.git

diff --git a/t/git.t b/t/git.t
index 5069ae2c..445ef248 100644
--- a/t/git.t
+++ b/t/git.t
@@ -1,21 +1,20 @@
-# Copyright (C) 2015-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2015-2019 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
 use Test::More;
 use File::Temp qw/tempdir/;
 my $dir = tempdir('pi-git-XXXXXX', TMPDIR => 1, CLEANUP => 1);
-use Cwd qw/getcwd/;
 use PublicInbox::Spawn qw(popen_rd);
 
-use_ok 'PublicInbox::Git';
 eval { require IPC::Run } or plan skip_all => 'IPC::Run missing';
+use_ok 'PublicInbox::Git';
 
 {
 	is(system(qw(git init -q --bare), $dir), 0, 'created git directory');
 	my $cmd = [ 'git', "--git-dir=$dir", 'fast-import', '--quiet' ];
 
-	my $fi_data = getcwd().'/t/git.fast-import-data';
+	my $fi_data = './t/git.fast-import-data';
 	ok(-r $fi_data, "fast-import data readable (or run test at top level)");
 	IPC::Run::run($cmd, '<', $fi_data);
 	is($?, 0, 'fast-import succeeded');
@@ -23,6 +22,7 @@ eval { require IPC::Run } or plan skip_all => 'IPC::Run missing';
 
 {
 	my $gcf = PublicInbox::Git->new($dir);
+	is($gcf->modified, 749520000, 'modified time detected from commit');
 	my $f = 'HEAD:foo.txt';
 	my @x = $gcf->check($f);
 	is(scalar @x, 3, 'returned 3 element array for existing file');
@@ -33,33 +33,7 @@ eval { require IPC::Run } or plan skip_all => 'IPC::Run missing';
 	my $raw = $gcf->cat_file($f);
 	is($x[2], length($$raw), 'length matches');
 
-	{
-		my $size;
-		my $rv = $gcf->cat_file($f, sub {
-			my ($in, $left) = @_;
-			$size = $$left;
-			'nothing'
-		});
-		is($rv, 'nothing', 'returned from callback without reading');
-		is($size, $x[2], 'set size for callback correctly');
-	}
-
-	eval { $gcf->cat_file($f, sub { die 'OMG' }) };
-	like($@, qr/\bOMG\b/, 'died in callback propagated');
 	is(${$gcf->cat_file($f)}, $$raw, 'not broken after failures');
-
-	{
-		my ($buf, $r);
-		my $rv = $gcf->cat_file($f, sub {
-			my ($in, $left) = @_;
-			$r = read($in, $buf, 2);
-			$$left -= $r;
-			'blah'
-		});
-		is($r, 2, 'only read 2 bytes');
-		is($buf, '--', 'partial read succeeded');
-		is($rv, 'blah', 'return value propagated');
-	}
 	is(${$gcf->cat_file($f)}, $$raw, 'not broken after partial read');
 }
 
@@ -67,7 +41,7 @@ if (1) {
 	my $cmd = [ 'git', "--git-dir=$dir", qw(hash-object -w --stdin) ];
 
 	# need a big file, use the AGPL-3.0 :p
-	my $big_data = getcwd().'/COPYING';
+	my $big_data = './COPYING';
 	ok(-r $big_data, 'COPYING readable');
 	my $size = -s $big_data;
 	ok($size > 8192, 'file is big enough');
@@ -79,48 +53,16 @@ if (1) {
 
 	my $gcf = PublicInbox::Git->new($dir);
 	my $rsize;
-	is($gcf->cat_file($buf, sub {
-		$rsize = ${$_[1]};
-		'x';
-	}), 'x', 'checked input');
-	is($rsize, $size, 'got correct size on big file');
-
 	my $x = $gcf->cat_file($buf, \$rsize);
 	is($rsize, $size, 'got correct size ref on big file');
 	is(length($$x), $size, 'read correct number of bytes');
 
-	my $rline;
-	$gcf->cat_file($buf, sub {
-		my ($in, $left) = @_;
-		$rline = <$in>;
-		$$left -= length($rline);
-	});
-	{
-		open my $fh, '<', $big_data or die "open failed: $!\n";
-		is($rline, <$fh>, 'first line matches');
-	};
-
-	my $all;
-	$gcf->cat_file($buf, sub {
-		my ($in, $left) = @_;
-		my $x = read($in, $all, $$left);
-		$$left -= $x;
-	});
-	{
-		open my $fh, '<', $big_data or die "open failed: $!\n";
-		local $/;
-		is($all, <$fh>, 'entire read matches');
-	};
-
 	my $ref = $gcf->qx(qw(cat-file blob), $buf);
-	is($all, $ref, 'qx read giant single string');
-
 	my @ref = $gcf->qx(qw(cat-file blob), $buf);
-	is($all, join('', @ref), 'qx returned array when wanted');
 	my $nl = scalar @ref;
 	ok($nl > 1, "qx returned array length of $nl");
 
-	$gcf->qx(qw(repack -adbq));
+	$gcf->qx(qw(repack -adq));
 	ok($gcf->packed_bytes > 0, 'packed size is positive');
 }
 
@@ -142,6 +84,25 @@ if ('alternates reloaded') {
 	open $fh, '<', "$alt/config" or die "open failed: $!\n";
 	my $config = eval { local $/; <$fh> };
 	is($$found, $config, 'alternates reloaded');
+
+	ok(!$gcf->cleanup, 'cleanup can expire');
+	ok(!$gcf->cleanup, 'cleanup idempotent');
+
+	my $t = $gcf->modified;
+	ok($t <= time, 'repo not modified in the future');
+	isnt($t, 0, 'repo not modified in 1970')
 }
 
+use_ok 'PublicInbox::Git', qw(git_unquote git_quote);
+my $s;
+is("foo\nbar", git_unquote($s = '"foo\\nbar"'), 'unquoted newline');
+is("Eléanor", git_unquote($s = '"El\\303\\251anor"'), 'unquoted octal');
+is(git_unquote($s = '"I\"m"'), 'I"m', 'unquoted dq');
+is(git_unquote($s = '"I\\m"'), 'I\\m', 'unquoted backslash');
+
+is(git_quote($s = "Eléanor"), '"El\\303\\251anor"', 'quoted octal');
+is(git_quote($s = "hello\"world"), '"hello\"world"', 'quoted dq');
+is(git_quote($s = "hello\\world"), '"hello\\\\world"', 'quoted backslash');
+is(git_quote($s = "hello\nworld"), '"hello\\nworld"', 'quoted LF');
+
 done_testing();