Mercurial > evolve
changeset 5198:cbfd36046969 stable
tests: use appropriate Python (2 or 3) for dummyssh
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Fri, 13 Mar 2020 19:11:43 +0700 |
| parents | 143ac9ac77a3 |
| children | 3302e4e742bc |
| files | tests/test-discovery-obshashrange-cache.t tests/test-discovery-obshashrange.t tests/test-evolve-serveronly-bundle2.t tests/test-topic-push-concurrent-on.t tests/test-topic-push.t tests/test-wireproto-bundle1.t tests/test-wireproto.t |
| diffstat | 7 files changed, 9 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-discovery-obshashrange-cache.t Wed Mar 11 18:28:26 2020 +0100 +++ b/tests/test-discovery-obshashrange-cache.t Fri Mar 13 19:11:43 2020 +0700 @@ -16,11 +16,9 @@ > verbose-obsolescence-exchange=1 > [ui] > logtemplate = "{rev} {node|short} {desc} {tags}\n" - > ssh=python "$RUNTESTDIR/dummyssh" + > ssh = "$PYTHON" "$RUNTESTDIR/dummyssh" > [alias] > debugobsolete=debugobsolete -d '0 0' - > [ui] - > ssh=$PYTHON "$RUNTESTDIR/dummyssh" > EOF $ hg init main
--- a/tests/test-discovery-obshashrange.t Wed Mar 11 18:28:26 2020 +0100 +++ b/tests/test-discovery-obshashrange.t Fri Mar 13 19:11:43 2020 +0700 @@ -18,7 +18,7 @@ > verbose-obsolescence-exchange=1 > [ui] > logtemplate = "{rev} {node|short} {desc} {tags}\n" - > ssh=python "$RUNTESTDIR/dummyssh" + > ssh = "$PYTHON" "$RUNTESTDIR/dummyssh" > [alias] > debugobsolete=debugobsolete -d '0 0' > EOF @@ -193,7 +193,7 @@ could not import hgext.hgext3rd.evolve (No module named hgext3rd.evolve): trying hgext3rd.hgext3rd.evolve (?) could not import hgext3rd.hgext3rd.evolve (No module named hgext3rd.evolve): trying hgext3rd.evolve (?) pushing to ssh://user@dummy/server - running python "*/dummyssh" *user@dummy* *hg -R server serve --stdio* (glob) + running "*python*" "*/dummyssh" *user@dummy* *hg -R server serve --stdio* (glob) sending hello command sending between command remote: * (glob) @@ -324,7 +324,7 @@ * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obscache in *.???? seconds (0r, 1o) (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobsolete ffffffffffffffffffffffffffffffffffffffff 45f8b879de922f6a6e620ba04205730335b6fc7e exited 0 after *.?? seconds (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> push -f --debug (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> running python "*/dummyssh" *user@dummy* *hg -R server serve --stdio* (glob) + * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> running "*python*" "*/dummyssh" *user@dummy* *hg -R server serve --stdio* (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending hello command (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending between command (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> remote: * (glob)
--- a/tests/test-evolve-serveronly-bundle2.t Wed Mar 11 18:28:26 2020 +0100 +++ b/tests/test-evolve-serveronly-bundle2.t Fri Mar 13 19:11:43 2020 +0700 @@ -8,7 +8,7 @@ > push_ssl = false > allow_push = * > [ui] - > ssh=python "$RUNTESTDIR/dummyssh" + > ssh = "$PYTHON" "$RUNTESTDIR/dummyssh" > [phases] > publish = False > [experimental]
--- a/tests/test-topic-push-concurrent-on.t Wed Mar 11 18:28:26 2020 +0100 +++ b/tests/test-topic-push-concurrent-on.t Fri Mar 13 19:11:43 2020 +0700 @@ -5,7 +5,7 @@ $ cat << EOF >> $HGRCPATH > [ui] > logtemplate = {rev} {branch} {get(namespaces, "topics")} {phase} {desc|firstline}\n - > ssh =python "$RUNTESTDIR/dummyssh" + > ssh = "$PYTHON" "$RUNTESTDIR/dummyssh" > [server] > concurrent-push-mode=check-related > EOF
--- a/tests/test-topic-push.t Wed Mar 11 18:28:26 2020 +0100 +++ b/tests/test-topic-push.t Fri Mar 13 19:11:43 2020 +0700 @@ -3,7 +3,7 @@ $ cat << EOF >> $HGRCPATH > [ui] > logtemplate = {rev} {branch} {get(namespaces, "topics")} {phase} {desc|firstline}\n - > ssh =python "$RUNTESTDIR/dummyssh" + > ssh = "$PYTHON" "$RUNTESTDIR/dummyssh" > EOF $ hg init main
--- a/tests/test-wireproto-bundle1.t Wed Mar 11 18:28:26 2020 +0100 +++ b/tests/test-wireproto-bundle1.t Fri Mar 13 19:11:43 2020 +0700 @@ -3,7 +3,7 @@ > [defaults] > amend=-d "0 0" > [ui] - > ssh=python "$RUNTESTDIR/dummyssh" + > ssh = "$PYTHON" "$RUNTESTDIR/dummyssh" > [phases] > publish = False > [extensions]
--- a/tests/test-wireproto.t Wed Mar 11 18:28:26 2020 +0100 +++ b/tests/test-wireproto.t Fri Mar 13 19:11:43 2020 +0700 @@ -6,7 +6,7 @@ > obsmarkers-exchange-debug=true > bundle2-exp=true > [ui] - > ssh=python "$RUNTESTDIR/dummyssh" + > ssh = "$PYTHON" "$RUNTESTDIR/dummyssh" > [phases] > publish = False > [extensions]