Mercurial > hg
changeset 38338:2313a3599e41
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
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Mon, 28 May 2018 16:55:11 +0200 |
| parents | 756a7682837f |
| children | 03aa222ca28e |
| files | tests/test-shelve.t |
| diffstat | 1 files changed, 9 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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