From patchwork Tue Aug 3 04:50:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: D11246: tests: manual cleanup now that dummyssh usage is implied From: phabricator X-Patchwork-Id: 49560 Message-Id: To: Phabricator Cc: mercurial-devel@mercurial-scm.org Date: Tue, 3 Aug 2021 04:50:56 +0000 valentin.gatienbaron created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D11246 AFFECTED FILES tests/library-infinitepush.sh tests/narrow-library.sh tests/remotefilelog-library.sh tests/test-bookmarks-corner-case.t tests/test-bookmarks-pushpull.t tests/test-bundle2-exchange.t tests/test-bundle2-format.t tests/test-bundle2-remote-changegroup.t tests/test-fastannotate-protocol.t tests/test-infinitepush-ci.t tests/test-log.t tests/test-logexchange.t tests/test-missing-capability.t tests/test-ssh-bundle1.t tests/test-ssh-proto.t tests/test-ssh-repoerror.t tests/test-ssh.t tests/test-treemanifest.t CHANGE DETAILS To: valentin.gatienbaron, #hg-reviewers Cc: mercurial-patches, mercurial-devel diff --git a/tests/test-treemanifest.t b/tests/test-treemanifest.t --- a/tests/test-treemanifest.t +++ b/tests/test-treemanifest.t @@ -1,7 +1,3 @@ - $ cat << EOF >> $HGRCPATH - > [ui] - > EOF - Set up repo $ hg --config experimental.treemanifest=True init repo diff --git a/tests/test-ssh.t b/tests/test-ssh.t --- a/tests/test-ssh.t +++ b/tests/test-ssh.t @@ -149,8 +149,6 @@ updating rc $ echo "default-push = ssh://user@dummy/remote" >> .hg/hgrc - $ echo "[ui]" >> .hg/hgrc - $ echo "ssh = \"$PYTHON\" \"$TESTDIR/dummyssh\"" >> .hg/hgrc find outgoing @@ -515,7 +513,6 @@ $ cat >> .hg/hgrc << EOF > [paths] > default-push = ssh://user@dummy/remote - > [ui] > [extensions] > localwrite = localwrite.py > EOF diff --git a/tests/test-ssh-repoerror.t b/tests/test-ssh-repoerror.t --- a/tests/test-ssh-repoerror.t +++ b/tests/test-ssh-repoerror.t @@ -4,12 +4,6 @@ `alias hg=rhg` by run-tests.py. With such alias removed, this test is revealed buggy. This need to be resolved sooner than later. -initial setup - - $ cat << EOF >> $HGRCPATH - > [ui] - > EOF - repository itself is non-readable --------------------------------- diff --git a/tests/test-ssh-proto.t b/tests/test-ssh-proto.t --- a/tests/test-ssh-proto.t +++ b/tests/test-ssh-proto.t @@ -28,7 +28,6 @@ > } $ cat >> $HGRCPATH << EOF - > [ui] > [devel] > debug.peer-request = true > [extensions] diff --git a/tests/test-ssh-bundle1.t b/tests/test-ssh-bundle1.t --- a/tests/test-ssh-bundle1.t +++ b/tests/test-ssh-bundle1.t @@ -163,8 +163,6 @@ updating rc $ echo "default-push = ssh://user@dummy/remote" >> .hg/hgrc - $ echo "[ui]" >> .hg/hgrc - $ echo "ssh = \"$PYTHON\" \"$TESTDIR/dummyssh\"" >> .hg/hgrc find outgoing @@ -462,7 +460,6 @@ $ cat >> .hg/hgrc << EOF > [paths] > default-push = ssh://user@dummy/remote - > [ui] > [extensions] > localwrite = localwrite.py > EOF diff --git a/tests/test-missing-capability.t b/tests/test-missing-capability.t --- a/tests/test-missing-capability.t +++ b/tests/test-missing-capability.t @@ -24,9 +24,6 @@ > [extensions] > disable-lookup = $TESTTMP/disable-lookup.py > EOF - $ cat >> .hg/hgrc < [ui] - > EOF $ hg pull ssh://user@dummy/repo1 -r tip -B a pulling from ssh://user@dummy/repo1 diff --git a/tests/test-logexchange.t b/tests/test-logexchange.t --- a/tests/test-logexchange.t +++ b/tests/test-logexchange.t @@ -2,7 +2,6 @@ ============================================= $ cat >> $HGRCPATH << EOF - > [ui] > [alias] > glog = log -G -T '{rev}:{node|short} {desc}' > [extensions] diff --git a/tests/test-log.t b/tests/test-log.t --- a/tests/test-log.t +++ b/tests/test-log.t @@ -2516,8 +2516,7 @@ is global. So we shouldn't expect the namespace always exists. Using ssh:// makes sure a bundle repository is created from scratch. (issue6301) - $ hg clone \ - > -qr0 "ssh://user@dummy/`pwd`/a" a-clone + $ hg clone -qr0 "ssh://user@dummy/`pwd`/a" a-clone $ hg incoming --config extensions.names=names.py -R a-clone \ > -T '{bars}\n' -l1 comparing with ssh://user@dummy/$TESTTMP/a diff --git a/tests/test-infinitepush-ci.t b/tests/test-infinitepush-ci.t --- a/tests/test-infinitepush-ci.t +++ b/tests/test-infinitepush-ci.t @@ -9,7 +9,6 @@ $ . "$TESTDIR/library-infinitepush.sh" $ cat >> $HGRCPATH < [ui] > [alias] > glog = log -GT "{rev}:{node|short} {desc}\n{phase}" > EOF diff --git a/tests/test-fastannotate-protocol.t b/tests/test-fastannotate-protocol.t --- a/tests/test-fastannotate-protocol.t +++ b/tests/test-fastannotate-protocol.t @@ -1,5 +1,4 @@ $ cat >> $HGRCPATH << EOF - > [ui] > [extensions] > fastannotate= > [fastannotate] diff --git a/tests/test-bundle2-remote-changegroup.t b/tests/test-bundle2-remote-changegroup.t --- a/tests/test-bundle2-remote-changegroup.t +++ b/tests/test-bundle2-remote-changegroup.t @@ -94,7 +94,6 @@ $ cat dumb.pid >> $DAEMON_PIDS $ cat >> $HGRCPATH << EOF - > [ui] > [command-templates] > log={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline} > EOF diff --git a/tests/test-bundle2-format.t b/tests/test-bundle2-format.t --- a/tests/test-bundle2-format.t +++ b/tests/test-bundle2-format.t @@ -233,7 +233,6 @@ > bundle2=$TESTTMP/bundle2.py > [experimental] > evolution.createmarkers=True - > [ui] > [command-templates] > log={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline} > [web] diff --git a/tests/test-bundle2-exchange.t b/tests/test-bundle2-exchange.t --- a/tests/test-bundle2-exchange.t +++ b/tests/test-bundle2-exchange.t @@ -28,7 +28,6 @@ > evolution.createmarkers=True > evolution.exchange=True > bundle2-output-capture=True - > [ui] > [command-templates] > log={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline} > [web] @@ -921,9 +920,6 @@ Test lazily acquiring the lock during unbundle $ cp $TESTTMP/hgrc.orig $HGRCPATH - $ cat >> $HGRCPATH < [ui] - > EOF $ cat >> $TESTTMP/locktester.py < import os diff --git a/tests/test-bookmarks-pushpull.t b/tests/test-bookmarks-pushpull.t --- a/tests/test-bookmarks-pushpull.t +++ b/tests/test-bookmarks-pushpull.t @@ -1142,7 +1142,6 @@ > local=../issue4455-dest/ > ssh=ssh://user@dummy/issue4455-dest > http=http://localhost:$HGPORT/ - > [ui] > EOF $ cat >> ../issue4455-dest/.hg/hgrc << EOF > [hooks] diff --git a/tests/test-bookmarks-corner-case.t b/tests/test-bookmarks-corner-case.t --- a/tests/test-bookmarks-corner-case.t +++ b/tests/test-bookmarks-corner-case.t @@ -16,7 +16,6 @@ ------------ $ cat >> $HGRCPATH << EOF - > [ui] > [server] > concurrent-push-mode=check-related > EOF diff --git a/tests/remotefilelog-library.sh b/tests/remotefilelog-library.sh --- a/tests/remotefilelog-library.sh +++ b/tests/remotefilelog-library.sh @@ -7,7 +7,6 @@ remotefilelog= rebase= strip= -[ui] [server] preferuncompressed=True [experimental] diff --git a/tests/narrow-library.sh b/tests/narrow-library.sh --- a/tests/narrow-library.sh +++ b/tests/narrow-library.sh @@ -1,7 +1,6 @@ cat >> $HGRCPATH <> $HGRCPATH << EOF [extensions] infinitepush= -[ui] [infinitepush] branchpattern=re:scratch/.* EOF