This instance was upgraded to Heptapod 0.27.2 on 2021-12-08 at 22:00 UTC+1

Commit acd74c92 authored by Anton Shestakov's avatar Anton Shestakov
Browse files

tests: use appropriate Python (2 or 3) for json.tool

parent 6576f6bb644b
Pipeline #12131 passed with stage
in 6 minutes and 42 seconds
......@@ -358,7 +358,7 @@ Check that all option doesn't crash on a cycle either
Check the json output is valid in this case
$ hg obslog "desc(D)" --hidden --no-graph -Tjson | python -m json.tool
$ hg obslog "desc(D)" --hidden --no-graph -Tjson | "$PYTHON" -m json.tool
[
{
"markers": [
......@@ -559,7 +559,7 @@ Check the json output is valid in this case
}
]
$ hg obslog "desc(D)" --hidden --no-graph --no-origin -Tjson | python -m json.tool
$ hg obslog "desc(D)" --hidden --no-graph --no-origin -Tjson | "$PYTHON" -m json.tool
[
{
"markers": [
......
......@@ -185,7 +185,7 @@ Check that obslog on A0 with all option shows everything
|
x 0dec01379d3b (2) B0
$ hg obslog eb5a0daa2192 --no-graph --no-origin -Tjson | python -m json.tool
$ hg obslog eb5a0daa2192 --no-graph --no-origin -Tjson | "$PYTHON" -m json.tool
[
{
"markers": [],
......@@ -277,7 +277,7 @@ Check that obslog on A0 with all option shows everything
"shortdescription": "A0"
}
]
$ hg obslog eb5a0daa2192 --no-graph -Tjson | python -m json.tool
$ hg obslog eb5a0daa2192 --no-graph -Tjson | "$PYTHON" -m json.tool
[
{
"markers": [
......
......@@ -155,7 +155,7 @@ Check that the same thing works with the old {shortdescription} form
|
x A0
$ hg obslog 4ae3a4151de9 --no-graph -Tjson | python -m json.tool
$ hg obslog 4ae3a4151de9 --no-graph -Tjson | "$PYTHON" -m json.tool
[
{
"markers": [
......@@ -194,7 +194,7 @@ Check that the same thing works with the old {shortdescription} form
$ hg obslog --hidden --patch 471f378eab4c
x 471f378eab4c (1) A0
$ hg obslog --hidden 471f378eab4c --no-graph -Tjson | python -m json.tool
$ hg obslog --hidden 471f378eab4c --no-graph -Tjson | "$PYTHON" -m json.tool
[
{
"markers": [],
......
......@@ -137,7 +137,7 @@ Check that with all option, every changeset is shown
reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
$ hg obslog --hidden 471f378eab4c --no-graph --no-origin -Tjson | python -m json.tool
$ hg obslog --hidden 471f378eab4c --no-graph --no-origin -Tjson | "$PYTHON" -m json.tool
[
{
"markers": [
......@@ -188,7 +188,7 @@ Check that with all option, every changeset is shown
"shortdescription": "A0"
}
]
$ hg obslog --hidden 471f378eab4c --no-graph -Tjson | python -m json.tool
$ hg obslog --hidden 471f378eab4c --no-graph -Tjson | "$PYTHON" -m json.tool
[
{
"markers": [],
......@@ -315,7 +315,7 @@ Check that obslog on the both diverged revision shows a coherent graph
|
x 471f378eab4c (1) A0
$ hg obslog '65b757b745b9+fdf9bde5129a' --no-graph --no-origin -Tjson | python -m json.tool
$ hg obslog '65b757b745b9+fdf9bde5129a' --no-graph --no-origin -Tjson | "$PYTHON" -m json.tool
[
{
"markers": [],
......@@ -376,7 +376,7 @@ Check that obslog on the both diverged revision shows a coherent graph
"shortdescription": "A1"
}
]
$ hg obslog '65b757b745b9+fdf9bde5129a' --no-graph -Tjson | python -m json.tool
$ hg obslog '65b757b745b9+fdf9bde5129a' --no-graph -Tjson | "$PYTHON" -m json.tool
[
{
"markers": [
......
......@@ -166,7 +166,7 @@ Check that obslog on the successor revision shows a coherent graph
+B0
$ hg obslog eb5a0daa2192 --no-graph --no-origin -Tjson | python -m json.tool
$ hg obslog eb5a0daa2192 --no-graph --no-origin -Tjson | "$PYTHON" -m json.tool
[
{
"markers": [],
......@@ -241,7 +241,7 @@ Check that obslog on the successor revision shows a coherent graph
/
x 471f378eab4c (1) A0
$ hg obslog eb5a0daa2192 --no-graph -Tjson | python -m json.tool
$ hg obslog eb5a0daa2192 --no-graph -Tjson | "$PYTHON" -m json.tool
[
{
"markers": [
......
......@@ -225,7 +225,7 @@ Actual test
|
x de7290d8b885 (1) A0
$ hg obslog de7290d8b885 --hidden --no-graph --no-origin -Tjson | python -m json.tool
$ hg obslog de7290d8b885 --hidden --no-graph --no-origin -Tjson | "$PYTHON" -m json.tool
[
{
"markers": [
......@@ -273,7 +273,7 @@ Actual test
|
x de7290d8b885 (1) A0
$ hg obslog c7f044602e9b --no-graph --no-origin -Tjson | python -m json.tool
$ hg obslog c7f044602e9b --no-graph --no-origin -Tjson | "$PYTHON" -m json.tool
[
{
"markers": [],
......@@ -312,7 +312,7 @@ Actual test
"shortdescription": "A0"
}
]
$ hg obslog c7f044602e9b --no-graph -Tjson | python -m json.tool
$ hg obslog c7f044602e9b --no-graph -Tjson | "$PYTHON" -m json.tool
[
{
"markers": [
......
......@@ -105,7 +105,7 @@ Check that with all option, every changeset is shown
|
@ 471f378eab4c (1) A0
$ hg obslog --hidden 471f378eab4c --no-graph --no-origin -Tjson | python -m json.tool
$ hg obslog --hidden 471f378eab4c --no-graph --no-origin -Tjson | "$PYTHON" -m json.tool
[
{
"markers": [
......@@ -135,7 +135,7 @@ Check that with all option, every changeset is shown
"shortdescription": "A0"
}
]
$ hg obslog --hidden 471f378eab4c --no-graph -Tjson | python -m json.tool
$ hg obslog --hidden 471f378eab4c --no-graph -Tjson | "$PYTHON" -m json.tool
[
{
"markers": [],
......@@ -186,7 +186,7 @@ Check that obslog on the both draft (divergent) and public (diverged) revisions
|
@ 471f378eab4c (1) A0
$ hg obslog 'fdf9bde5129a+471f378eab4c' --no-graph --no-origin -Tjson | python -m json.tool
$ hg obslog 'fdf9bde5129a+471f378eab4c' --no-graph --no-origin -Tjson | "$PYTHON" -m json.tool
[
{
"markers": [],
......@@ -221,7 +221,7 @@ Check that obslog on the both draft (divergent) and public (diverged) revisions
"shortdescription": "A0"
}
]
$ hg obslog 'fdf9bde5129a+471f378eab4c' --no-graph -Tjson | python -m json.tool
$ hg obslog 'fdf9bde5129a+471f378eab4c' --no-graph -Tjson | "$PYTHON" -m json.tool
[
{
"markers": [
......
......@@ -67,7 +67,7 @@ Actual test
pruned using prune by test (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, no predecessors)
$ hg obslog 'desc(B0)' --hidden --no-graph -Tjson | python -m json.tool
$ hg obslog 'desc(B0)' --hidden --no-graph -Tjson | "$PYTHON" -m json.tool
[
{
"markers": [
......@@ -94,7 +94,7 @@ Actual test
$ hg obslog 'desc(A0)' --patch
@ 471f378eab4c (1) A0
$ hg obslog 'desc(A0)' --no-graph -Tjson | python -m json.tool
$ hg obslog 'desc(A0)' --no-graph -Tjson | "$PYTHON" -m json.tool
[
{
"markers": [],
......
......@@ -109,7 +109,7 @@ Check that obslog on split commit shows both targets
note: testing split
(No patch available, too many successors (2))
$ hg obslog 471597cad322 --hidden --no-graph --no-origin -Tjson | python -m json.tool
$ hg obslog 471597cad322 --hidden --no-graph --no-origin -Tjson | "$PYTHON" -m json.tool
[
{
"markers": [
......@@ -144,7 +144,7 @@ Check that obslog on split commit shows both targets
"shortdescription": "A0"
}
]
$ hg obslog 471597cad322 --hidden --no-graph -Tjson | python -m json.tool
$ hg obslog 471597cad322 --hidden --no-graph -Tjson | "$PYTHON" -m json.tool
[
{
"markers": [],
......
......@@ -104,7 +104,7 @@ Simple test
s2(e629654d7050): c_d
s1(8522f9e3fee9): c_c
s0(ea705abc4f51)^ c_b (base)
$ hg stack -Tjson | python -m json.tool
$ hg stack -Tjson | "$PYTHON" -m json.tool
[
{
"desc": "c_f",
......@@ -157,7 +157,7 @@ Simple test
"symbol": "^"
}
]
$ hg stack -v -Tjson | python -m json.tool
$ hg stack -v -Tjson | "$PYTHON" -m json.tool
[
{
"desc": "c_f",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment