web commit by http://adam.shand.net/

[git.ikiwiki.info.git] / t / git.t

diff --git a/t/git.t b/t/git.t
index a3e5b36decd782a929bba4d10206c57c462afb40..f4e27c473c5279f6e5a389e000d74f66a5edf2be 100755 (executable)
--- a/t/git.t
+++ b/t/git.t
@@ -24,17 +24,17 @@ $config{rcs} = "git";
 $config{srcdir} = "$dir/src";
 IkiWiki::checkconfig();
 
 $config{srcdir} = "$dir/src";
 IkiWiki::checkconfig();
 

-system "cd $gitrepo && git init-db 2>/dev/null";
-system "cd $gitrepo && echo dummy >dummy; git add . 2>/dev/null";
-system "cd $gitrepo && git commit -m Initial 2>/dev/null";
-system "git clone -l -s $gitrepo $config{srcdir} 2>/dev/null";
+system "cd $gitrepo && git init >/dev/null 2>&1";
+system "cd $gitrepo && echo dummy > dummy; git add . >/dev/null 2>&1";
+system "cd $gitrepo && git commit -m Initial >/dev/null 2>&1";
+system "git clone -l -s $gitrepo $config{srcdir} >/dev/null 2>&1";

 
 my @changes;
 @changes = IkiWiki::rcs_recentchanges(3);
 
 is($#changes, 0); # counts for dummy commit during repo creation
 is($changes[0]{message}[0]{"line"}, "Initial");
 
 my @changes;
 @changes = IkiWiki::rcs_recentchanges(3);
 
 is($#changes, 0); # counts for dummy commit during repo creation
 is($changes[0]{message}[0]{"line"}, "Initial");

-is($changes[0]{pages}[0]{"page"}, undef); # no diff for first commit
+is($changes[0]{pages}[0]{"page"}, "dummy");

 
 # Web commit
 my $test1 = readfile("t/test1.mdwn");
 
 # Web commit
 my $test1 = readfile("t/test1.mdwn");


@@ -53,9 +53,9 @@ my $message = "Added the second page";
 
 my $test2 = readfile("t/test2.mdwn");
 writefile('test2.mdwn', $config{srcdir}, $test2);
 
 my $test2 = readfile("t/test2.mdwn");
 writefile('test2.mdwn', $config{srcdir}, $test2);

-system "cd $config{srcdir}; git add test2.mdwn 2>/dev/null";
-system "cd $config{srcdir}; git commit -m \"$message\" test2.mdwn 2>/dev/null";
-system "cd $config{srcdir}; git push origin 2>/dev/null";
+system "cd $config{srcdir}; git add test2.mdwn >/dev/null 2>&1";
+system "cd $config{srcdir}; git commit -m \"$message\" test2.mdwn >/dev/null 2>&1";
+system "cd $config{srcdir}; git push origin >/dev/null 2>&1";

 
 @changes = IkiWiki::rcs_recentchanges(3);
 
 
 @changes = IkiWiki::rcs_recentchanges(3);