diff options
Diffstat (limited to 'linaropy/git/worktree.py')
| -rw-r--r-- | linaropy/git/worktree.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/linaropy/git/worktree.py b/linaropy/git/worktree.py index 7da0cf8..70c9623 100644 --- a/linaropy/git/worktree.py +++ b/linaropy/git/worktree.py @@ -7,9 +7,9 @@ import uuid from ..proj import Proj from ..cd import cd -from gitrepo import GitRepo +from .gitrepo import GitRepo -from clone import Clone +from .clone import Clone from sh import git, ErrorReturnCode, rm @@ -657,10 +657,10 @@ class TestWorktree(unittest.TestCase): with self.assertRaises(EnvironmentError) as context: self.worktree.clean(True) - self.assertRegexpMatches(str(context.exception), - "branch deletion failed:") - self.assertRegexpMatches(str(context.exception), - "not fully merged") + self.assertRegex(str(context.exception), + "branch deletion failed:") + self.assertRegex(str(context.exception), + "not fully merged") self.assertFalse(os.path.isdir(worktreePath)) @@ -726,9 +726,9 @@ class TestWorktree(unittest.TestCase): with self.assertRaises(EnvironmentError) as context: self.worktree.clean(False) - self.assertRegexpMatches(str(context.exception), - 'Worktree directory not found: %s' % - worktreePath) + self.assertRegex(str(context.exception), + 'Worktree directory not found: %s' % + worktreePath) if __name__ == '__main__': # logging.basicConfig(level="INFO") |