Mercurial > hg
changeset 40269:52b773f5e9a4
tests: replace `cd ..` with an absolute path in a couple ssh tests
These tests are broken under py3 on Windows to the point where the `cd ..` was
actually escaping into the system wide $TEMP. The subsequent `hg init` created
a repo there, and then added a local extension to the hgrc. This breaks every
single subsequent test when it tries to `hg init` in its $TESTTMP, and can't
load the localwrite.py extension. And since I botched this the first time and
replaced the wrong `cd ..`, this just replaces all of them. I've noticed test
garbage in $TEMP recently, and maybe this will help.
Perhaps `hg init` shouldn't load the config for the local repo, but this is an
easy enough workaround for now.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Sat, 13 Oct 2018 19:49:33 -0400 |
| parents | 9c4cbbb0fc51 |
| children | 8783710b1d58 |
| files | tests/test-ssh-bundle1.t tests/test-ssh.t |
| diffstat | 2 files changed, 16 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-ssh-bundle1.t Thu Oct 04 00:17:26 2018 -0400 +++ b/tests/test-ssh-bundle1.t Sat Oct 13 19:49:33 2018 -0400 @@ -48,7 +48,7 @@ > [hooks] > changegroup = sh -c "printenv.py changegroup-in-remote 0 ../dummylog" > EOF - $ cd .. + $ cd $TESTTMP repo not found error @@ -87,7 +87,7 @@ checked 3 changesets with 2 changes to 2 files $ hg branches default 0:1160648e36ce - $ cd .. + $ cd $TESTTMP clone bookmarks via stream @@ -103,7 +103,7 @@ $ cd stream2 $ hg book mybook 0:1160648e36ce - $ cd .. + $ cd $TESTTMP $ rm -rf local-stream stream2 #endif @@ -210,7 +210,7 @@ remote: adding manifests remote: adding file changes remote: added 1 changesets with 1 changes to 1 files - $ cd ../remote + $ cd $TESTTMP/remote check remote tip @@ -236,7 +236,7 @@ test pushkeys and bookmarks - $ cd ../local + $ cd $TESTTMP/local $ hg debugpushkey --config ui.ssh="\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote namespaces bookmarks namespaces @@ -343,7 +343,7 @@ abort: password in URL not supported! [255] - $ cd .. + $ cd $TESTTMP hide outer repo $ hg init @@ -433,7 +433,7 @@ updating 6c0482d977a3 to public failed! [1] - $ cd .. + $ cd $TESTTMP stderr from remote commands should be printed before stdout from local code (issue4336) @@ -500,7 +500,7 @@ received listkey for "phases": 15 bytes checking for updated bookmarks - $ cd .. + $ cd $TESTTMP $ cat dummylog Got arguments 1:user@dummy 2:hg -R nonexistent serve --stdio
--- a/tests/test-ssh.t Thu Oct 04 00:17:26 2018 -0400 +++ b/tests/test-ssh.t Sat Oct 13 19:49:33 2018 -0400 @@ -38,7 +38,7 @@ > [hooks] > changegroup = sh -c "printenv.py changegroup-in-remote 0 ../dummylog" > EOF - $ cd .. + $ cd $TESTTMP repo not found error @@ -73,7 +73,7 @@ checked 3 changesets with 2 changes to 2 files $ hg branches default 0:1160648e36ce - $ cd .. + $ cd $TESTTMP clone bookmarks via stream @@ -87,7 +87,7 @@ $ cd stream2 $ hg book mybook 0:1160648e36ce - $ cd .. + $ cd $TESTTMP $ rm -rf local-stream stream2 #endif @@ -194,7 +194,7 @@ remote: adding manifests remote: adding file changes remote: added 1 changesets with 1 changes to 1 files - $ cd ../remote + $ cd $TESTTMP/remote check remote tip @@ -220,7 +220,7 @@ test pushkeys and bookmarks - $ cd ../local + $ cd $TESTTMP/local $ hg debugpushkey --config ui.ssh="\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote namespaces bookmarks namespaces @@ -359,7 +359,7 @@ abort: password in URL not supported! [255] - $ cd .. + $ cd $TESTTMP hide outer repo $ hg init @@ -460,7 +460,7 @@ abort: push failed on remote [255] - $ cd .. + $ cd $TESTTMP stderr from remote commands should be printed before stdout from local code (issue4336) @@ -549,7 +549,7 @@ bundle2-input-bundle: 2 parts total checking for updated bookmarks - $ cd .. + $ cd $TESTTMP $ cat dummylog Got arguments 1:user@dummy 2:hg -R nonexistent serve --stdio