From f6fdb67cec5c75b3f0a855042942dac75c612065 Mon Sep 17 00:00:00 2001 From: Arthur Milchior Date: Tue, 13 Aug 2019 01:09:04 +0200 Subject: Adding test --- git/test/test_repo.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'git/test') diff --git a/git/test/test_repo.py b/git/test/test_repo.py index 0577bd58..c74d4ef4 100644 --- a/git/test/test_repo.py +++ b/git/test/test_repo.py @@ -1023,3 +1023,25 @@ class TestRepo(TestBase): self.assertEqual(r.working_dir, repo_dir) finally: os.environ = oldenv + + @with_rw_directory + def test_rebasing(self, rw_dir): + r = Repo.init(rw_dir) + fp = osp.join(rw_dir, 'hello.txt') + r.git.commit("--allow-empty", message="init",) + with open(fp, 'w') as fs: + fs.write("hello world") + r.git.add(Git.polish_url(fp)) + r.git.commit(message="English") + self.assertEqual(r.currently_rebasing_on(), None) + r.git.checkout("HEAD^1") + with open(fp, 'w') as fs: + fs.write("Hola Mundo") + r.git.add(Git.polish_url(fp)) + r.git.commit(message="Spanish") + commitSpanish = r.commit() + try: + r.git.rebase("master") + except GitCommandError: + pass + self.assertEqual(r.currently_rebasing_on(), commitSpanish) -- cgit v1.2.3