tests: get rid of unnecessary Cwd module use

[public-inbox.git] / t / git.t

diff --git a/t/git.t b/t/git.t
index 7f96293fb25a1511452ce1e242822afa5791b49f..7edf82b44a6dd124cee85e89a1a5f219313a85dc 100644 (file)
--- a/t/git.t
+++ b/t/git.t
@@ -5,29 +5,24 @@ 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);
 
+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 $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)");
-       my $pid = fork;
-       defined $pid or die "fork failed: $!\n";
-       if ($pid == 0) {
-               open STDIN, '<', $fi_data or die "open $fi_data: $!\n";
-               exec @cmd;
-               die "failed exec: ",join(' ', @cmd),": $!\n";
-       }
-       waitpid $pid, 0;
+       IPC::Run::run($cmd, '<', $fi_data);
        is($?, 0, 'fast-import succeeded');
 }
 
 {
        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');
@@ -69,30 +64,16 @@ use_ok 'PublicInbox::Git';
 }
 
 if (1) {
-       use POSIX qw(dup2);
-       my @cmd = ('git', "--git-dir=$dir", qw(hash-object -w --stdin));
+       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');
 
-       my ($r, $w);
-       ok(pipe($r, $w), 'created pipe');
-
-       my $pid = fork;
-       defined $pid or die "fork failed: $!\n";
-       if ($pid == 0) {
-               close $r;
-               open STDIN, '<', $big_data or die "open $big_data: $!\n";
-               dup2(fileno($w), 1);
-               exec @cmd;
-               die "failed exec: ",join(' ', @cmd),": $!\n";
-       }
-       close $w;
-       my $n = read $r, my $buf, 41;
-       waitpid $pid, 0;
+       my $buf = '';
+       IPC::Run::run($cmd, '<', $big_data, '>', \$buf);
        is(0, $?, 'hashed object successfully');
        chomp $buf;
 
@@ -139,7 +120,7 @@ if (1) {
        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');
 }
 
@@ -161,6 +142,26 @@ 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(time - 30), 'cleanup did not expire');
+       ok(!$gcf->cleanup(time + 30), '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();