|
2 | 2 | import github3
|
3 | 3 | from github3 import repos
|
4 | 4 | from datetime import datetime
|
5 |
| -from tests.utils import (BaseCase, load) |
6 |
| -try: |
7 |
| - from unittest.mock import patch, mock_open |
8 |
| -except ImportError: |
9 |
| - from mock import patch, mock_open |
| 5 | +from tests.utils import (BaseCase, load, mock) |
10 | 6 |
|
11 | 7 |
|
12 | 8 | class TestRepository(BaseCase):
|
@@ -64,8 +60,8 @@ def test_archive(self):
|
64 | 60 | self.request.return_value.raw.seek(0)
|
65 | 61 | self.request.return_value._content_consumed = False
|
66 | 62 |
|
67 |
| - o = mock_open() |
68 |
| - with patch('{0}.open'.format(__name__), o, create=True): |
| 63 | + o = mock.mock_open() |
| 64 | + with mock.patch('{0}.open'.format(__name__), o, create=True): |
69 | 65 | with open('archive', 'wb+') as fd:
|
70 | 66 | self.repo.archive('tarball', fd)
|
71 | 67 |
|
@@ -401,15 +397,15 @@ def test_create_tag(self):
|
401 | 397 | None, None, None, None, None)
|
402 | 398 |
|
403 | 399 | self.login()
|
404 |
| - with patch.object(repos.Repository, 'create_ref'): |
| 400 | + with mock.patch.object(repos.Repository, 'create_ref'): |
405 | 401 | assert self.repo.create_tag(None, None, None, None,
|
406 | 402 | None) is None
|
407 | 403 | tag = self.repo.create_tag(**data)
|
408 | 404 | assert isinstance(tag, github3.git.Tag)
|
409 | 405 | assert repr(tag).startswith('<Tag')
|
410 | 406 | self.mock_assertions()
|
411 | 407 |
|
412 |
| - with patch.object(repos.Repository, 'create_ref') as cr: |
| 408 | + with mock.patch.object(repos.Repository, 'create_ref') as cr: |
413 | 409 | self.repo.create_tag('tag', '', 'fakesha', '', '',
|
414 | 410 | lightweight=True)
|
415 | 411 | cr.assert_called_once_with('refs/tags/tag', 'fakesha')
|
@@ -1020,12 +1016,12 @@ def test_update_label(self):
|
1020 | 1016 | self.not_called()
|
1021 | 1017 |
|
1022 | 1018 | self.login()
|
1023 |
| - with patch.object(repos.Repository, 'label') as l: |
| 1019 | + with mock.patch.object(repos.Repository, 'label') as l: |
1024 | 1020 | l.return_value = None
|
1025 | 1021 | assert self.repo.update_label('foo', 'bar') is False
|
1026 | 1022 | self.not_called()
|
1027 | 1023 |
|
1028 |
| - with patch.object(repos.Repository, 'label') as l: |
| 1024 | + with mock.patch.object(repos.Repository, 'label') as l: |
1029 | 1025 | l.return_value = github3.issues.label.Label(load('label'), self.g)
|
1030 | 1026 | assert self.repo.update_label('big_bug', 'fafafa')
|
1031 | 1027 |
|
|
0 commit comments