Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-dispatch: stabilize the test stable 4.4
authorJun Wu <quark@fb.com>
Wed, 01 Nov 2017 14:22:26 -0700
branchstable
changeset 34953 0ccb43d4cf01
parent 34952 05ebb553bd03
child 34954 43d8e2fc1457
test-dispatch: stabilize the test When cwd is removed and `hg` is executed, some shells may run `getcwd` before forking and executing, some may not do it, some may print a different error message. The test should be shell-independent so let's just avoid checking the error message. Differential Revision: https://phab.mercurial-scm.org/D1282
tests/test-dispatch.t file | annotate | diff | comparison | revisions 
--- a/tests/test-dispatch.t	Wed Nov 01 15:34:22 2017 -0500
+++ b/tests/test-dispatch.t	Wed Nov 01 14:22:26 2017 -0700
@@ -68,9 +68,13 @@
   $ mkdir $TESTTMP/repo1
   $ cd $TESTTMP/repo1
   $ rm -rf $TESTTMP/repo1
-  $ HGDEMANDIMPORT=disable hg version -q
-  abort: error getting current working directory: * (glob) (no-chg !)
-  chg: abort: failed to getcwd (errno = *) (glob) (chg !)
-  [255]
+
+The output could be one of the following and something else:
+ chg: abort: failed to getcwd (errno = *) (glob)
+ abort: error getting current working directory: * (glob)
+ sh: 0: getcwd() failed: No such file or directory
+Since the exact behavior depends on the shell, only check it returns non-zero.
+  $ HGDEMANDIMPORT=disable hg version -q 2>/dev/null || false
+  [1]
 
 #endif
mercurial