--- a/tests/test-ssh
+++ b/tests/test-ssh
@@ -1,5 +1,7 @@
#!/bin/sh
+cp "$TESTDIR"/printenv.py .
+
# This test tries to exercise the ssh functionality with a dummy script
cat <<'EOF' > dummyssh
@@ -33,7 +35,7 @@ hg ci -A -m "init" -d "1000000 0" foo fo
echo '[server]' > .hg/hgrc
echo 'uncompressed = True' >> .hg/hgrc
echo '[hooks]' >> .hg/hgrc
-echo 'changegroup = echo changegroup in remote: u=$HG_URL >> ../dummylog' >> .hg/hgrc
+echo 'changegroup = python ../printenv.py changegroup-in-remote 0 ../dummylog' >> .hg/hgrc
cd ..
@@ -55,7 +57,7 @@ cd local
hg verify
echo '[hooks]' >> .hg/hgrc
-echo 'changegroup = echo changegroup in local: u=$HG_URL >> ../dummylog' >> .hg/hgrc
+echo 'changegroup = python ../printenv.py changegroup-in-local 0 ../dummylog' >> .hg/hgrc
echo "# empty default pull"
hg paths
--- a/tests/test-ssh.out
+++ b/tests/test-ssh.out
@@ -85,6 +85,6 @@ Got arguments 1:user@dummy 2:hg -R remot
Got arguments 1:user@dummy 2:hg -R remote serve --stdio 3: 4: 5:
Got arguments 1:user@dummy 2:hg -R local serve --stdio 3: 4: 5:
Got arguments 1:user@dummy 2:hg -R remote serve --stdio 3: 4: 5:
-changegroup in remote: u=remote:ssh:127.0.0.1
+changegroup-in-remote hook: HG_NODE=572896fe480d7581849806ee402175c49cb20037 HG_SOURCE=serve HG_URL=remote:ssh:127.0.0.1
Got arguments 1:user@dummy 2:hg -R remote serve --stdio 3: 4: 5:
-changegroup in remote: u=remote:ssh:127.0.0.1
+changegroup-in-remote hook: HG_NODE=ac7448082955a0b2ff5cb4512c1e061c779bbc79 HG_SOURCE=serve HG_URL=remote:ssh:127.0.0.1