# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1584101503 -25200
# Node ID cbfd360469696386034e2f652b628ac304392119
# Parent  143ac9ac77a3a830ddcc600abd863436d4fc0596
tests: use appropriate Python (2 or 3) for dummyssh

diff -r 143ac9ac77a3 -r cbfd36046969 tests/test-discovery-obshashrange-cache.t
--- 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
diff -r 143ac9ac77a3 -r cbfd36046969 tests/test-discovery-obshashrange.t
--- 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)
diff -r 143ac9ac77a3 -r cbfd36046969 tests/test-evolve-serveronly-bundle2.t
--- 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]
diff -r 143ac9ac77a3 -r cbfd36046969 tests/test-topic-push-concurrent-on.t
--- 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
diff -r 143ac9ac77a3 -r cbfd36046969 tests/test-topic-push.t
--- 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
diff -r 143ac9ac77a3 -r cbfd36046969 tests/test-wireproto-bundle1.t
--- 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]
diff -r 143ac9ac77a3 -r cbfd36046969 tests/test-wireproto.t
--- 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]