diff options
Diffstat (limited to 'testing/test_mercurial.py')
| -rw-r--r-- | testing/test_mercurial.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/testing/test_mercurial.py b/testing/test_mercurial.py index 6df3cc0..1d91444 100644 --- a/testing/test_mercurial.py +++ b/testing/test_mercurial.py @@ -134,6 +134,13 @@ def test_version_bump_before_merge_commit(wd): assert wd.version.startswith('1.1.dev1+') +@pytest.mark.issue(219) +@pytest.mark.usefixtures("pre_merge_commit_after_tag") +def test_version_bump_from_merge_commit(wd): + wd.commit() + assert wd.version.startswith('1.1.dev3+') # issue 219 + + @pytest.mark.usefixtures("version_1_0") def test_version_bump_from_commit_including_hgtag_mods(wd): """ Test the case where a commit includes changes to .hgtags and other files @@ -144,4 +151,4 @@ def test_version_bump_from_commit_including_hgtag_mods(wd): wd(wd.add_command) assert wd.version.startswith('1.1.dev1+') # bump from dirty version wd.commit() # commits both the testfile _and_ .hgtags - assert wd.version.startswith('1.1.dev2+')
\ No newline at end of file + assert wd.version.startswith('1.1.dev2+') |