From e9787b03f8d9812c0b46b024499ee94533e164fe Mon Sep 17 00:00:00 2001 From: Sitaram Chamarty Date: Fri, 16 Jul 2010 11:25:31 +0530 Subject: [PATCH] darn... git 1.7+ puts out different messages on clone... --- t/t00-initial | 2 +- t/t03a-branch-permissions | 4 ++-- t/t04a-wild-all | 8 ++++---- t/t04a-wild-students | 8 ++++---- t/t09a-oldtests | 2 +- t/t50-sequence-test | 6 +++--- t/t53-check-info-expand-output | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/t/t00-initial b/t/t00-initial index d708fdd..c17ee86 100644 --- a/t/t00-initial +++ b/t/t00-initial @@ -19,7 +19,7 @@ expect "remote: Initialized empty Git repository in /home/gitolite-test/reposito name "basic clone" cd ~/td runlocal git clone u1:aa u1aa -expect "Initialized empty Git repository in /home/tester/td/u1aa/.git/" +expect "Cloning into u1aa..." expect "warning: You appear to have cloned an empty repository" runlocal ls -ald u1aa expect "drwxr-xr-x 3 $USER $USER 4096 201.-..-.. ..:.. u1aa" diff --git a/t/t03a-branch-permissions b/t/t03a-branch-permissions index 2d7c6e4..f8a3452 100644 --- a/t/t03a-branch-permissions +++ b/t/t03a-branch-permissions @@ -142,7 +142,7 @@ repo r1 notexpect ABORT cd ~/td runlocal git clone gitolite:r1 -expect "Initialized empty Git repository in /home/tester/td/r1/.git/" +expect "Cloning into r1..." cd ~/td/r1 mdc; mdc; mdc mdc; mdc; mdc @@ -163,7 +163,7 @@ repo r2 notexpect ABORT cd ~/td runlocal git clone gitolite:r2 -expect "Initialized empty Git repository in /home/tester/td/r2/.git/" +expect "Cloning into r2..." cd ~/td/r2 mdc; mdc; mdc mdc; mdc; mdc diff --git a/t/t04a-wild-all b/t/t04a-wild-all index ae9010f..7bcefab 100644 --- a/t/t04a-wild-all +++ b/t/t04a-wild-all @@ -52,7 +52,7 @@ expect "\* \[new branch\] master -> master" name "u1 clone success" cd ~/td runlocal git clone u1:foo/u4/a12 u1a12 -expect "Initialized empty Git repository in /home/tester/td/u1a12/.git/" +expect "Cloning into u1a12..." name "u1 push fail" cd ~/td/u1a12 @@ -63,7 +63,7 @@ expect "W access for foo/u4/a12 DENIED to u1" name "u2 clone success" cd ~/td runlocal git clone u2:foo/u4/a12 u2a12 -expect "Initialized empty Git repository in /home/tester/td/u2a12/.git/" +expect "Cloning into u2a12..." name "u2 push success" cd ~/td/u2a12 @@ -113,7 +113,7 @@ expect_filesame $TESTDIR/out/t04-wild1.2 name "u5 clone success" cd ~/td runlocal git clone u5:foo/u4/a12 u5a12 -expect "Initialized empty Git repository in /home/tester/td/u5a12/.git/" +expect "Cloning into u5a12..." name "u5 push fail" cd ~/td/u5a12 @@ -124,7 +124,7 @@ expect "W access for foo/u4/a12 DENIED to u5" name "u6 clone success" cd ~/td runlocal git clone u6:foo/u4/a12 u6a12 -expect "Initialized empty Git repository in /home/tester/td/u6a12/.git/" +expect "Cloning into u6a12..." name "u6 push success" cd ~/td/u6a12 diff --git a/t/t04a-wild-students b/t/t04a-wild-students index a37a6ab..0fdc85c 100644 --- a/t/t04a-wild-students +++ b/t/t04a-wild-students @@ -50,7 +50,7 @@ expect "\* \[new branch\] master -> master" name "u1 clone success" cd ~/td runlocal git clone u1:foo/u4/a12 u1a12 -expect "Initialized empty Git repository in /home/tester/td/u1a12/.git/" +expect "Cloning into u1a12..." name "u1 push fail" cd ~/td/u1a12 @@ -61,7 +61,7 @@ expect "W access for foo/u4/a12 DENIED to u1" name "u2 clone success" cd ~/td runlocal git clone u2:foo/u4/a12 u2a12 -expect "Initialized empty Git repository in /home/tester/td/u2a12/.git/" +expect "Cloning into u2a12..." name "u2 push success" cd ~/td/u2a12 @@ -111,7 +111,7 @@ expect_filesame $TESTDIR/out/t04-wild1.2 name "u5 clone success" cd ~/td runlocal git clone u5:foo/u4/a12 u5a12 -expect "Initialized empty Git repository in /home/tester/td/u5a12/.git/" +expect "Cloning into u5a12..." name "u5 push fail" cd ~/td/u5a12 @@ -122,7 +122,7 @@ expect "W access for foo/u4/a12 DENIED to u5" name "u6 clone success" cd ~/td runlocal git clone u6:foo/u4/a12 u6a12 -expect "Initialized empty Git repository in /home/tester/td/u6a12/.git/" +expect "Cloning into u6a12..." name "u6 push success" cd ~/td/u6a12 diff --git a/t/t09a-oldtests b/t/t09a-oldtests index 16edb61..5e6e178 100644 --- a/t/t09a-oldtests +++ b/t/t09a-oldtests @@ -36,7 +36,7 @@ notexpect "failed to push" cd ~/td runlocal git clone u1:abc -expect "Initialized empty Git repository in /home/tester/td/abc/.git/" +expect "Cloning into abc..." cd ~/td/abc mdc jfile; runlocal git push origin master expect "To u1:abc" diff --git a/t/t50-sequence-test b/t/t50-sequence-test index 4c540f7..0a33eb7 100644 --- a/t/t50-sequence-test +++ b/t/t50-sequence-test @@ -37,7 +37,7 @@ do name "push" cd ~/td runlocal git clone u2:foo/u1/bar u2bar - expect "Initialized empty Git repository in /home/tester/td/u2bar/.git/" + expect "Cloning into u2bar..." cd u2bar mdc u2file1 runlocal git push @@ -66,7 +66,7 @@ do cd ~/td runlocal git clone u1:foo/u1/bar - expect "Initialized empty Git repository in /home/gitolite-test/repositories/foo/u1/bar.git/" + expect "Cloning into bar..." cd bar mdc u1file1 @@ -83,7 +83,7 @@ do name "push" cd ~/td runlocal git clone u2:foo/u1/bar u2bar - expect "Initialized empty Git repository in /home/tester/td/u2bar/.git/" + expect "Cloning into u2bar..." cd u2bar mdc u2file1 runlocal git push diff --git a/t/t53-check-info-expand-output b/t/t53-check-info-expand-output index 43bb938..ad845b7 100644 --- a/t/t53-check-info-expand-output +++ b/t/t53-check-info-expand-output @@ -34,14 +34,14 @@ do name "u1 info" runlocal ssh u1 info - expect "hello u1, the gitolite version here is v" + expect "hello u1, the gitolite version here is" expect "@R.*@W.*testing" [ "$wr" = "1" ] && expect "C.*R.*W.*foo/u1/\\.\\+" name "u1 expand" runlocal ssh u1 expand [ "$wr" = "0" ] && expect "wildrepos disabled, sorry" - [ "$wr" = "1" ] && expect "hello u1, the gitolite version here is v" + [ "$wr" = "1" ] && expect "hello u1, the gitolite version here is" [ "$wr" = "1" ] && expect "R.*W.*(u1).*foo/u1/bar" [ "$wr" = "1" ] && expect "@R.*@W.*testing"