Patchwork D3686: shelve: wider check for successful abort in test

login
register
mail settings
Submitter phabricator
Date June 5, 2018, 10:56 a.m.
Message ID <differential-rev-PHID-DREV-g56cc6nsykqdyw3crruw-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/31970/
State Superseded
Headers show

Comments

phabricator - June 5, 2018, 10:56 a.m.
lothiraldan created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  The test was previously focusing on checking that the "sub-rebase" aborted
  properly. Since rebase is an implementation details we should also check for
  other messages.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  tests/test-shelve.t

CHANGE DETAILS




To: lothiraldan, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/tests/test-shelve.t b/tests/test-shelve.t
--- a/tests/test-shelve.t
+++ b/tests/test-shelve.t
@@ -1289,8 +1289,16 @@ 
   [1]
   $ sed 's/ae8c668541e8/123456789012/' .hg/shelvedstate > ../corrupt-shelvedstate
   $ mv ../corrupt-shelvedstate .hg/histedit-state
-  $ hg unshelve --abort 2>&1 | grep 'rebase aborted'
+  $ hg unshelve --abort 2>&1 | grep 'aborted'
   rebase aborted
+  unshelve of 'default-01' aborted
+  $ hg summary
+  parent: 0:ae8c668541e8 tip
+   root
+  branch: default
+  commit: 1 modified, 1 unknown
+  update: (current)
+  phases: 1 draft
   $ hg up -C .
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved