You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2016/09/28 16:01:16 UTC
[5/5] allura git commit: Fix tests using non-existnant assert_* mock
methods
Fix tests using non-existnant assert_* mock methods
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/0ae3e6d7
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/0ae3e6d7
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/0ae3e6d7
Branch: refs/heads/master
Commit: 0ae3e6d71a97467e89f5790b2a152b7469b9f6e0
Parents: 5f3d7dc
Author: Dave Brondsema <da...@brondsema.net>
Authored: Thu Sep 22 15:19:25 2016 -0400
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Sep 28 11:54:58 2016 -0400
----------------------------------------------------------------------
.../allura/tests/functional/test_site_admin.py | 2 +-
Allura/allura/tests/model/test_discussion.py | 10 +++++-----
Allura/allura/tests/test_tasks.py | 6 ++----
.../tests/unit/test_ldap_auth_provider.py | 6 +++---
Allura/allura/tests/unit/test_repo.py | 4 ++--
.../forgeimporters/github/tests/test_code.py | 2 +-
.../forgeimporters/github/tests/test_oauth.py | 20 ++++++++++++++------
.../forgeimporters/github/tests/test_tracker.py | 2 +-
.../forgeimporters/github/tests/test_wiki.py | 2 +-
.../tests/github/functional/test_github.py | 2 +-
.../forgeimporters/tests/github/test_tracker.py | 2 --
.../tests/model/test_svnimplementation.py | 4 ++--
.../forgeuserstats/tests/test_model.py | 2 +-
13 files changed, 34 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/0ae3e6d7/Allura/allura/tests/functional/test_site_admin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_site_admin.py b/Allura/allura/tests/functional/test_site_admin.py
index 64c2dbb..7889136 100644
--- a/Allura/allura/tests/functional/test_site_admin.py
+++ b/Allura/allura/tests/functional/test_site_admin.py
@@ -691,7 +691,7 @@ class TestUserDetails(TestController):
with td.audits('Set random password', user=True, actor='test-admin'):
r = self.app.post('/nf/admin/user/set_random_password', params={'username': 'test-user'})
assert_in('Password is set', self.webflash(r))
- set_password.assert_called_once()
+ assert_equal(set_password.call_count, 1)
@patch('allura.tasks.mail_tasks.sendsimplemail')
@patch('allura.lib.helpers.gen_message_id')
http://git-wip-us.apache.org/repos/asf/allura/blob/0ae3e6d7/Allura/allura/tests/model/test_discussion.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/model/test_discussion.py b/Allura/allura/tests/model/test_discussion.py
index 27f83cf..bd95bd3 100644
--- a/Allura/allura/tests/model/test_discussion.py
+++ b/Allura/allura/tests/model/test_discussion.py
@@ -480,7 +480,7 @@ def test_not_spam_and_has_unmoderated_post_permission(spam_checker):
@with_setup(setUp, tearDown)
@mock.patch('allura.controllers.discuss.g.spam_checker')
@mock.patch.object(M.Thread, 'notify_moderators')
-def test_not_spam_but_has_no_unmoderated_post_permission(spam_checker, notify_moderators):
+def test_not_spam_but_has_no_unmoderated_post_permission(notify_moderators, spam_checker):
spam_checker.check.return_value = False
d = M.Discussion(shortname='test', name='test')
t = M.Thread(discussion_id=d._id, subject='Test Thread')
@@ -490,13 +490,13 @@ def test_not_spam_but_has_no_unmoderated_post_permission(spam_checker, notify_mo
with h.push_config(c, user=M.User.anonymous()):
post = t.post('Hey')
assert_equal(post.status, 'pending')
- notify_moderators.assert_called_once()
+ assert_equal(notify_moderators.call_count, 1)
@with_setup(setUp, tearDown)
@mock.patch('allura.controllers.discuss.g.spam_checker')
@mock.patch.object(M.Thread, 'notify_moderators')
-def test_spam_and_has_unmoderated_post_permission(spam_checker, notify_moderators):
+def test_spam_and_has_unmoderated_post_permission(notify_moderators, spam_checker):
spam_checker.check.return_value = True
d = M.Discussion(shortname='test', name='test')
t = M.Thread(discussion_id=d._id, subject='Test Thread')
@@ -508,7 +508,7 @@ def test_spam_and_has_unmoderated_post_permission(spam_checker, notify_moderator
with h.push_config(c, user=M.User.anonymous()):
post = t.post('Hey')
assert_equal(post.status, 'pending')
- notify_moderators.assert_called_once()
+ assert_equal(notify_moderators.call_count, 1)
@with_setup(setUp, tearDown)
@@ -518,7 +518,7 @@ def test_thread_subject_not_included_in_text_checked(spam_checker):
d = M.Discussion(shortname='test', name='test')
t = M.Thread(discussion_id=d._id, subject='Test Thread')
t.post('Hello')
- spam_checker.check.assert_called_once()
+ assert_equal(spam_checker.check.call_count, 1)
assert_equal(spam_checker.check.call_args[0][0], 'Hello')
http://git-wip-us.apache.org/repos/asf/allura/blob/0ae3e6d7/Allura/allura/tests/test_tasks.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_tasks.py b/Allura/allura/tests/test_tasks.py
index 525e7e3..7224ec0 100644
--- a/Allura/allura/tests/test_tasks.py
+++ b/Allura/allura/tests/test_tasks.py
@@ -547,16 +547,14 @@ class TestExportTasks(unittest.TestCase):
path = BE.get_export_path('/tmp/bulk_export/p/test/', 'test-0.zip')
self.assertEqual(path, '/tmp/bulk_export/p/test/test-0')
- @mock.patch('allura.model.project.Project.__json__')
@mock.patch('allura.tasks.export_tasks.shutil')
@mock.patch('allura.tasks.export_tasks.zipdir')
@mock.patch('forgewiki.wiki_main.ForgeWikiApp.bulk_export')
@td.with_wiki
- def test_bulk_export(self, wiki_bulk_export, zipdir, shutil, project_json):
+ def test_bulk_export(self, wiki_bulk_export, zipdir, shutil):
M.MonQTask.query.remove()
export_tasks.bulk_export([u'wiki'])
- wiki_bulk_export.assert_called_once()
- project_json.assert_called_once()
+ assert_equal(wiki_bulk_export.call_count, 1)
temp = '/tmp/bulk_export/p/test/test'
zipfn = '/tmp/bulk_export/p/test/test.zip'
zipdir.assert_called_with(temp, zipfn)
http://git-wip-us.apache.org/repos/asf/allura/blob/0ae3e6d7/Allura/allura/tests/unit/test_ldap_auth_provider.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/unit/test_ldap_auth_provider.py b/Allura/allura/tests/unit/test_ldap_auth_provider.py
index abce671..298cd39 100644
--- a/Allura/allura/tests/unit/test_ldap_auth_provider.py
+++ b/Allura/allura/tests/unit/test_ldap_auth_provider.py
@@ -61,7 +61,7 @@ class TestLdapAuthenticationProvider(object):
connection.bind_s.called_once_with(dn, 'old-pass')
connection.modify_s.assert_called_once_with(
dn, [(ldap.MOD_REPLACE, 'userPassword', 'new-pass-hash')])
- connection.unbind_s.assert_called_once()
+ assert_equal(connection.unbind_s.call_count, 1)
@patch('allura.lib.plugin.ldap')
def test_login(self, ldap):
@@ -79,7 +79,7 @@ class TestLdapAuthenticationProvider(object):
ldap.initialize.assert_called_once_with('ldaps://localhost/')
connection = ldap.initialize.return_value
connection.bind_s.called_once_with(dn, 'test-password')
- connection.unbind_s.assert_called_once()
+ assert_equal(connection.unbind_s.call_count, 1)
@patch('allura.lib.plugin.ldap')
def test_login_autoregister(self, ldap):
@@ -125,7 +125,7 @@ class TestLdapAuthenticationProvider(object):
'cn=admin,dc=localdomain',
'admin-password')
connection.add_s.assert_called_once_with(dn, modlist.addModlist.return_value)
- connection.unbind_s.assert_called_once()
+ assert_equal(connection.unbind_s.call_count, 1)
@patch('allura.lib.plugin.ldap')
@patch('allura.lib.plugin.datetime', autospec=True)
http://git-wip-us.apache.org/repos/asf/allura/blob/0ae3e6d7/Allura/allura/tests/unit/test_repo.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/unit/test_repo.py b/Allura/allura/tests/unit/test_repo.py
index f3e0a25..eb78df4 100644
--- a/Allura/allura/tests/unit/test_repo.py
+++ b/Allura/allura/tests/unit/test_repo.py
@@ -17,7 +17,7 @@
import datetime
import unittest
-from mock import patch, Mock, MagicMock
+from mock import patch, Mock, MagicMock, call
from nose.tools import assert_equal
from datadiff import tools as dd
@@ -205,7 +205,7 @@ class TestCommit(unittest.TestCase):
commit.get_path('foo/', create=False)
commit.get_tree.assert_called_with(False)
commit.get_tree().__getitem__.assert_called_with('foo')
- commit.get_tree().__getitem__.assert_not_called_with('')
+ self.assertNotIn(call(''), commit.get_tree().__getitem__.call_args_list)
def test_get_tree_no_create(self):
c.model_cache = Mock()
http://git-wip-us.apache.org/repos/asf/allura/blob/0ae3e6d7/ForgeImporters/forgeimporters/github/tests/test_code.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/github/tests/test_code.py b/ForgeImporters/forgeimporters/github/tests/test_code.py
index e247a5f..bc293ce 100644
--- a/ForgeImporters/forgeimporters/github/tests/test_code.py
+++ b/ForgeImporters/forgeimporters/github/tests/test_code.py
@@ -131,4 +131,4 @@ class TestGitHubImportController(TestController, TestCase):
def test_oauth(self, oauth_begin):
self.app.get(
'/p/{}/admin/ext/import/github-repo/'.format(test_project_with_repo))
- oauth_begin.assert_called_once()
+ self.assertEqual(oauth_begin.call_count, 1)
http://git-wip-us.apache.org/repos/asf/allura/blob/0ae3e6d7/ForgeImporters/forgeimporters/github/tests/test_oauth.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/github/tests/test_oauth.py b/ForgeImporters/forgeimporters/github/tests/test_oauth.py
index 584b403..b336c7a 100644
--- a/ForgeImporters/forgeimporters/github/tests/test_oauth.py
+++ b/ForgeImporters/forgeimporters/github/tests/test_oauth.py
@@ -16,9 +16,13 @@
# under the License.
from unittest import TestCase
-from mock import Mock, patch
-from pylons import tmpl_context as c
+
+from mock import Mock, patch, MagicMock
+from pylons import tmpl_context as c, config
+from webob.exc import HTTPFound
+
from allura.tests import TestController
+from allura.tests.decorators import raises
from forgeimporters.github import GitHubOAuthMixin
@@ -53,8 +57,12 @@ class TestGitHubOAuthMixin(TestController, TestCase):
req.head.return_value.headers = {'X-OAuth-Scopes': 'write:repo_hook, user'}
self.assertTrue(self.mix.oauth_has_access('write:repo_hook'))
- @patch('forgeimporters.github.OAuth2Session')
- def test_oauth_callback_complete(self, oauth):
- with patch.object(self.mix, 'oauth_callback_complete') as _mock:
+ @patch.dict(config, {'github_importer.client_id': '123456',
+ 'github_importer.client_secret': 'deadbeef'})
+ @patch('forgeimporters.github.OAuth2Session', MagicMock())
+ @patch('forgeimporters.github.session', MagicMock())
+ @patch('forgeimporters.github.request', MagicMock())
+ def test_oauth_callback_complete(self):
+ with patch.object(self.mix, 'oauth_callback_complete') as _mock, raises(HTTPFound):
self.mix.oauth_callback()
- _mock.assert_called_once()
+ self.assertEqual(_mock.call_count, 1)
http://git-wip-us.apache.org/repos/asf/allura/blob/0ae3e6d7/ForgeImporters/forgeimporters/github/tests/test_tracker.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/github/tests/test_tracker.py b/ForgeImporters/forgeimporters/github/tests/test_tracker.py
index ba09ece..b2cda37 100644
--- a/ForgeImporters/forgeimporters/github/tests/test_tracker.py
+++ b/ForgeImporters/forgeimporters/github/tests/test_tracker.py
@@ -87,4 +87,4 @@ class TestGitHubTrackerImportController(TestController, TestCase):
@patch.object(GitHubOAuthMixin, 'oauth_begin')
def test_oauth(self, oauth_begin):
self.app.get(self.url)
- oauth_begin.assert_called_once()
+ self.assertEqual(oauth_begin.call_count, 1)
http://git-wip-us.apache.org/repos/asf/allura/blob/0ae3e6d7/ForgeImporters/forgeimporters/github/tests/test_wiki.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/github/tests/test_wiki.py b/ForgeImporters/forgeimporters/github/tests/test_wiki.py
index fa066b8..d69e3fc 100644
--- a/ForgeImporters/forgeimporters/github/tests/test_wiki.py
+++ b/ForgeImporters/forgeimporters/github/tests/test_wiki.py
@@ -621,4 +621,4 @@ class TestGitHubWikiImportController(TestController, TestCase):
@patch.object(GitHubOAuthMixin, 'oauth_begin')
def test_oauth(self, oauth_begin):
self.app.get(self.url)
- oauth_begin.assert_called_once()
+ self.assertEqual(oauth_begin.call_count, 1)
http://git-wip-us.apache.org/repos/asf/allura/blob/0ae3e6d7/ForgeImporters/forgeimporters/tests/github/functional/test_github.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/tests/github/functional/test_github.py b/ForgeImporters/forgeimporters/tests/github/functional/test_github.py
index 6577e4d..3f6950e 100644
--- a/ForgeImporters/forgeimporters/tests/github/functional/test_github.py
+++ b/ForgeImporters/forgeimporters/tests/github/functional/test_github.py
@@ -71,7 +71,7 @@ class TestGitHubOAuth(TestController):
call('github.oauth.redirect',
'http://localhost/p/import_project/github/')
])
- session.save.assert_called_once()
+ assert_equal(session.save.call_count, 1)
r = self.app.get(redirect)
session.get.assert_has_calls([
http://git-wip-us.apache.org/repos/asf/allura/blob/0ae3e6d7/ForgeImporters/forgeimporters/tests/github/test_tracker.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/tests/github/test_tracker.py b/ForgeImporters/forgeimporters/tests/github/test_tracker.py
index fd7df5c..d37f901 100644
--- a/ForgeImporters/forgeimporters/tests/github/test_tracker.py
+++ b/ForgeImporters/forgeimporters/tests/github/test_tracker.py
@@ -53,7 +53,6 @@ class TestTrackerImporter(TestCase):
app = project.install_app.return_value
app.config.options.mount_point = 'mount_point'
app.url = 'foo'
- gpe.iter_issues.return_value = [(50, mock.Mock()), (100, mock.Mock())]
importer.import_tool(project, user, project_name='project_name',
mount_point='mount_point', mount_label='mount_label', user_name='me')
@@ -68,7 +67,6 @@ class TestTrackerImporter(TestCase):
'project_name': 'me/project_name',
}
)
- gpe.iter_issues.assert_called_once()
self.assertEqual(tlos.flush_all.call_args_list, [
mock.call(),
mock.call(),
http://git-wip-us.apache.org/repos/asf/allura/blob/0ae3e6d7/ForgeSVN/forgesvn/tests/model/test_svnimplementation.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/tests/model/test_svnimplementation.py b/ForgeSVN/forgesvn/tests/model/test_svnimplementation.py
index c4ab72e..c51cdce 100644
--- a/ForgeSVN/forgesvn/tests/model/test_svnimplementation.py
+++ b/ForgeSVN/forgesvn/tests/model/test_svnimplementation.py
@@ -54,8 +54,8 @@ class TestSVNImplementation(object):
assert_equal(impl._svn.info2.call_args[0]
[0], 'file://' + g.tmpdir + '/code/trunk/foo')
- treesdoc_partial.assert_called()
- lcd_partial.assert_called()
+ assert treesdoc_partial.called
+ assert lcd_partial.called
def test_last_commit_ids(self):
self._test_last_commit_ids('/trunk/foo/')
http://git-wip-us.apache.org/repos/asf/allura/blob/0ae3e6d7/ForgeUserStats/forgeuserstats/tests/test_model.py
----------------------------------------------------------------------
diff --git a/ForgeUserStats/forgeuserstats/tests/test_model.py b/ForgeUserStats/forgeuserstats/tests/test_model.py
index f741159..5076347 100644
--- a/ForgeUserStats/forgeuserstats/tests/test_model.py
+++ b/ForgeUserStats/forgeuserstats/tests/test_model.py
@@ -482,4 +482,4 @@ class TestUserStats(unittest.TestCase):
stats.addCommit(newcommit, commit_datetime, project)
self.assertEqual(stats.general[0].commits[0],
{'lines': 3, 'number': 2, 'language': None})
- unified_diff.assert_not_called()
+ assert not unified_diff.called