# HG changeset patch # User Boris Feld # Date 1527519311 -7200 # Node ID 2313a3599e410999738b368b5af842fc338f896f # Parent 756a7682837f2b4ae862a11511eb26ece4c6cda5 shelve: wider check for successful abort in test 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. Differential Revision: https://phab.mercurial-scm.org/D3686 diff -r 756a7682837f -r 2313a3599e41 tests/test-shelve.t --- a/tests/test-shelve.t Tue May 29 18:01:35 2018 +0200 +++ b/tests/test-shelve.t Mon May 28 16:55:11 2018 +0200 @@ -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