[PATCH 2 of 2] tests: python executable should always be globbed
Sean Farley
sean at farley.io
Thu Mar 24 19:36:58 EDT 2016
# HG changeset patch
# User Sean Farley <sean at farley.io>
# Date 1458862524 25200
# Thu Mar 24 16:35:24 2016 -0700
# Node ID ac83231f18e0931757c41f8e3cc99aa50e29b751
# Parent 3397fe3d6074a40b492f63dfb0e4013ceb0c25a7
# EXP-Topic smf/fix-install
tests: python executable should always be globbed
Similar to 4d93d73b8aec, the python executable could be python2.X, Python,
pypy, or maybe something futuristic like pyston or nuitka.
diff --git a/tests/test-install.t b/tests/test-install.t
--- a/tests/test-install.t
+++ b/tests/test-install.t
@@ -5,30 +5,30 @@ hg debuginstall
checking Python version (2.*) (glob)
checking Python lib (*lib*)... (glob)
checking installed modules (*mercurial)... (glob)
checking templates (*mercurial?templates)... (glob)
checking default template (*mercurial?templates?map-cmdline.default) (glob)
- checking commit editor... (*python* -c "import sys; sys.exit(0)") (glob)
+ checking commit editor... (* -c "import sys; sys.exit(0)") (glob)
checking username (test)
no problems detected
hg debuginstall JSON
$ hg debuginstall -Tjson
[
{
"defaulttemplate": "*mercurial?templates?map-cmdline.default", (glob)
"defaulttemplateerror": null,
"defaulttemplatenotfound": "default",
- "editor": "*python* -c \"import sys; sys.exit(0)\"", (glob)
+ "editor": "* -c \"import sys; sys.exit(0)\"", (glob)
"editornotfound": false,
"encoding": "ascii",
"encodingerror": null,
"extensionserror": null,
"hgmodules": "*mercurial", (glob)
"problems": 0,
"pythonexe": "*", (glob)
- "pythonlib": "*python*", (glob)
+ "pythonlib": "*", (glob)
"pythonver": "*.*.*", (glob)
"templatedirs": "*mercurial?templates", (glob)
"username": "test",
"usernameerror": null,
"vinotfound": false
@@ -42,11 +42,11 @@ hg debuginstall with no username
checking Python version (2.*) (glob)
checking Python lib (*lib*)... (glob)
checking installed modules (*mercurial)... (glob)
checking templates (*mercurial?templates)... (glob)
checking default template (*mercurial?templates?map-cmdline.default) (glob)
- checking commit editor... (*python* -c "import sys; sys.exit(0)") (glob)
+ checking commit editor... (* -c "import sys; sys.exit(0)") (glob)
checking username...
no username supplied
(specify a username in your configuration file)
1 problems detected, please check your install!
[1]
@@ -63,11 +63,11 @@ path variables are expanded (~ is the sa
checking Python version (*) (glob)
checking Python lib (*lib*)... (glob)
checking installed modules (*mercurial)... (glob)
checking templates (*mercurial?templates)... (glob)
checking default template (*mercurial?templates?map-cmdline.default) (glob)
- checking commit editor... (*python* -c "import sys; sys.exit(0)") (glob)
+ checking commit editor... (* -c "import sys; sys.exit(0)") (glob)
checking username (test)
no problems detected
#if test-repo
$ cat >> wixxml.py << EOF
More information about the Mercurial-devel
mailing list