TestImportOrigGitRepository: test higher level invocations

and add missing test for rrr_merge

Git-Dch: Ignore

1 files changed, 23 insertions, 6 deletions

diff --git a/tests/24_test_gbp_import_orig.py b/tests/24_test_gbp_import_orig.py
index 4ec58478..4264e669 100644
--- a/tests/24_test_gbp_import_orig.py
+++ b/tests/24_test_gbp_import_orig.py
@@ -18,18 +18,35 @@ class TestImportOrigGitRepository(DebianGitTestRepo):
         self.repo.rollback()
         self.assertEquals(self.repo.rollback_errors, [])
 
-    def test_rrr_delete_tag(self):
-        self.repo.rrr('doesnotmatter', 'delete', 'tag')
-        self.assertEquals(self.repo.rollbacks, [('doesnotmatter', 'tag', 'delete', None)])
+    def test_rrr_tag(self):
+        self.repo.rrr_tag('doesnotexist')
+        self.assertEquals(self.repo.rollbacks, [('doesnotexist', 'tag', 'delete', None)])
         self.repo.rollback()
         self.assertEquals(self.repo.rollback_errors, [])
 
-    def test_rrr_delete_branch(self):
-        self.repo.rrr('doesnotmatter', 'delete', 'branch')
-        self.assertEquals(self.repo.rollbacks, [('doesnotmatter', 'branch', 'delete', None)])
+    def test_rrr_branch(self):
+        self.repo.rrr_branch('doesnotexist', 'delete')
+        self.assertEquals(self.repo.rollbacks, [('doesnotexist', 'branch', 'delete', None)])
         self.repo.rollback()
         self.assertEquals(self.repo.rollback_errors, [])
 
+    def test_rrr_merge(self):
+        self.repo.rrr_merge('HEAD')
+        self.assertEquals(self.repo.rollbacks, [('HEAD', 'commit', 'abortmerge', None)])
+        self.repo.rollback()
+        self.assertEquals(self.repo.rollback_errors, [])
+
+    def test_rrr_merge_abort(self):
+        self.repo.rrr_merge('HEAD')
+        self.assertEquals(self.repo.rollbacks, [('HEAD', 'commit', 'abortmerge', None)])
+        # Test that we abort the merge in case MERGE_HEAD exists
+        with open(os.path.join(self.repo.git_dir, 'MERGE_HEAD'), 'w'):
+            pass
+        self.assertTrue(self.repo.is_in_merge())
+        self.repo.rollback()
+        self.assertFalse(self.repo.is_in_merge())
+        self.assertEquals(self.repo.rollback_errors, [])
+
     def test_rrr_unknown_action(self):
         with self.assertRaisesRegexp(GbpError, "Unknown action unknown for tag doesnotmatter"):
             self.repo.rrr('doesnotmatter', 'unknown', 'tag')