Patchwork D10298: tests: update the detailed exit codes for icasefs gated tests

login
register
mail settings
Submitter phabricator
Date April 4, 2021, 3:12 a.m.
Message ID <differential-rev-PHID-DREV-fw5lclqtnqrvm3ijnjlw-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/48616/
State Superseded
Headers show

Comments

phabricator - April 4, 2021, 3:12 a.m.
mharbison72 created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  The fact that there's already a detailed exit code after the last change here in
  test-casecollision-merge.t gives me some pause, but maybe it was found and
  changed manually?

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D10298

AFFECTED FILES
  tests/test-casecollision-merge.t
  tests/test-casefolding.t

CHANGE DETAILS




To: mharbison72, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/tests/test-casefolding.t b/tests/test-casefolding.t
--- a/tests/test-casefolding.t
+++ b/tests/test-casefolding.t
@@ -115,7 +115,7 @@ 
   $ hg up
   A: untracked file differs
   abort: untracked files in working directory differ from files in requested revision
-  [255]
+  [20]
   $ cat a
   gold
   $ rm a
diff --git a/tests/test-casecollision-merge.t b/tests/test-casecollision-merge.t
--- a/tests/test-casecollision-merge.t
+++ b/tests/test-casecollision-merge.t
@@ -145,7 +145,7 @@ 
 
   $ hg merge
   abort: case-folding collision between [aA] and [Aa] (re)
-  [255]
+  [20]
   $ hg parents --template '{rev}\n'
   4
   $ hg status -A
@@ -158,7 +158,7 @@ 
   1 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ hg merge
   abort: case-folding collision between [aA] and [Aa] (re)
-  [255]
+  [20]
   $ hg parents --template '{rev}\n'
   2
   $ hg status -A
@@ -213,7 +213,7 @@ 
 
   $ hg merge 0
   abort: case-folding collision between Aa and directory of aA/a
-  [255]
+  [20]
 (note: no collision between 0 and 00 or 000/f)
 
 Directory case-folding collision:
@@ -328,7 +328,7 @@ 
   A B
   $ hg update
   abort: case-folding collision between [bB] and [Bb] (re)
-  [255]
+  [20]
 
   $ hg update --check
   abort: uncommitted changes