summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSitaram Chamarty <sitaram@atc.tcs.com>2017-08-20 14:33:16 +0530
committerSitaram Chamarty <sitaram@atc.tcs.com>2017-08-23 14:37:04 +0530
commit2bc9ab3741895f7ca0b4a927402d8e0c1326c78e (patch)
tree912e365c9ce12a3ab5af1ccadc5a925a50d8c1f5
parent41b7885b77cfe992ad3c96d0b021ece51ce1b3e3 (diff)
(test suite) fixes for new git in fedora 26...
-rwxr-xr-xt/mirror-test8
-rwxr-xr-xt/partial-copy.t6
-rwxr-xr-xt/smart-http4
3 files changed, 9 insertions, 9 deletions
diff --git a/t/mirror-test b/t/mirror-test
index 627dc74..e0c4e36 100755
--- a/t/mirror-test
+++ b/t/mirror-test
@@ -91,7 +91,7 @@ try "
git add keydir; ok
git commit -m 6keys; ok
git push; ok
- /To frodo\@localhost:gitolite-admin/
+ /To localhost:gitolite-admin/
/master -> master/
sleep 5
git rev-parse HEAD
@@ -118,7 +118,7 @@ try "
cd sga; ok
empty; ok
git push; ok
- /To sam\@localhost:gitolite-admin/
+ /To localhost:gitolite-admin/
/master -> master/
sleep 5
git rev-parse HEAD
@@ -145,7 +145,7 @@ try "
cd gga; ok
empty; ok
git push; !ok
- !/To gollum\@localhost:gitolite-admin/
+ !/To localhost:gitolite-admin/
!/master -> master/
/gollum: pushing 'gitolite-admin' to slave 'gollum' not allowed/
git rev-parse HEAD
@@ -193,7 +193,7 @@ try "
cd fga; ok
empty; ok
git push; ok
- /To frodo\@localhost:gitolite-admin/
+ /To localhost:gitolite-admin/
/master -> master/
sleep 5
diff --git a/t/partial-copy.t b/t/partial-copy.t
index 5bff843..493f0d4 100755
--- a/t/partial-copy.t
+++ b/t/partial-copy.t
@@ -95,7 +95,7 @@ try "
/52c7716..ca37871 next -> next/
tag u4/nexttag; glt push u4 --tags
/To file:///foo-pc/
- /\\[new tag\\] u4/nexttag -> u4/nexttag/
+ /\\[new tag\\] u4/nexttag +-> +u4/nexttag/
/\\[new branch\\] ca3787119b7e8b9914bc22c939cefc443bc308da -> refs/partial/br-\\d+/
checkout master
@@ -112,8 +112,8 @@ try "
glt fetch u1
/From file:///foo/
/new branch\\] dev/u4/u4master -> origin/dev/u4/u4master/
- /new tag\\] u4/nexttag -> u4/nexttag/
- /52c7716..ca37871 next -> origin/next/
+ /new tag\\] u4/nexttag +-> +u4/nexttag/
+ /52c7716..ca37871 next +-> +origin/next/
checkout master; tc u1ma1 u1ma2;
/\\[master 8ab1ff5\\] u1ma2 at Thu Jul 7 06:23:20 2011/
tag mt2; PUSH u1 master; ok
diff --git a/t/smart-http b/t/smart-http
index 98fc8c0..9ae6d5b 100755
--- a/t/smart-http
+++ b/t/smart-http
@@ -63,7 +63,7 @@ tsh "
git push
ok
/Initialized.*usr.share.httpd.gitolite-home.repositories.t2.git/
- /To http:..admin:admin.localhost.git.gitolite-admin.git/
+ /To http:..localhost.git.gitolite-admin.git/
/master -. master/
## various ls-remotes
git ls-remote `url u1 gitolite-admin`
@@ -81,7 +81,7 @@ tsh "
## push to u1:t2
git push `url u1 t2` master:master
ok
- /To http:..u1:u1.localhost.git.t2.git/
+ /To http:..localhost.git.t2.git/
/master -. master/
git ls-remote `url u2 t2`
ok