You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by tv...@apache.org on 2013/08/06 21:39:14 UTC
git commit: [#6480] Fix tests to match refactors
Updated Branches:
refs/heads/tv/6480 f2b65b17d -> 7dc4626c1
[#6480] Fix tests to match refactors
Signed-off-by: Tim Van Steenburgh <tv...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/7dc4626c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/7dc4626c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/7dc4626c
Branch: refs/heads/tv/6480
Commit: 7dc4626c12c4eaa638dd370d13c38b8a450ff2d2
Parents: f2b65b1
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Tue Aug 6 19:38:52 2013 +0000
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Tue Aug 6 19:38:52 2013 +0000
----------------------------------------------------------------------
.../forgeimporters/tests/google/test_tasks.py | 9 ---------
ForgeImporters/forgeimporters/tests/test_base.py | 13 ++++++++++++-
2 files changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/7dc4626c/ForgeImporters/forgeimporters/tests/google/test_tasks.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/tests/google/test_tasks.py b/ForgeImporters/forgeimporters/tests/google/test_tasks.py
index bb9319d..a21d083 100644
--- a/ForgeImporters/forgeimporters/tests/google/test_tasks.py
+++ b/ForgeImporters/forgeimporters/tests/google/test_tasks.py
@@ -31,12 +31,3 @@ def test_import_project_info(c, session, gpe):
gpe.return_value.get_icon.assert_called_once_with()
gpe.return_value.get_license.assert_called_once_with()
session.flush_all.assert_called_once_with()
-
-
-@mock.patch.object(tasks.ToolImporter, 'by_name')
-@mock.patch.object(tasks, 'c')
-def test_import_tool(c, by_name):
- c.project = mock.Mock(name='project')
- tasks.import_tool('importer_name', 'mount_point', 'mount_label')
- by_name.assert_called_once_with('importer_name')
- by_name.return_value.import_tool.assert_called_once_with(c.project, 'mount_point', 'mount_label')
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/7dc4626c/ForgeImporters/forgeimporters/tests/test_base.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/tests/test_base.py b/ForgeImporters/forgeimporters/tests/test_base.py
index 1558db4..0782a42 100644
--- a/ForgeImporters/forgeimporters/tests/test_base.py
+++ b/ForgeImporters/forgeimporters/tests/test_base.py
@@ -23,6 +23,17 @@ import mock
from .. import base
+@mock.patch.object(base.ToolImporter, 'by_name')
+@mock.patch.object(base, 'c')
+def test_import_tool(c, by_name):
+ c.project = mock.Mock(name='project')
+ c.user = mock.Mock(name='user')
+ base.import_tool('importer_name', 'mount_point', 'mount_label')
+ by_name.assert_called_once_with('importer_name')
+ by_name.return_value.import_tool.assert_called_once_with(project=c.project,
+ user=c.user, mount_point='mount_point', mount_label='mount_label')
+
+
def ep(name, source=None, importer=None, **kw):
mep = mock.Mock(name='mock_ep', **kw)
mep.name = name
@@ -39,7 +50,7 @@ class TestProjectImporter(TestCase):
@mock.patch.object(base, 'iter_entry_points')
def test_tool_importers(self, iep):
eps = iep.return_value = [ep('ep1', 'foo'), ep('ep2', 'bar'), ep('ep3', 'foo')]
- pi = base.ProjectImporter()
+ pi = base.ProjectImporter(mock.Mock(name='neighborhood'))
pi.source = 'foo'
self.assertEqual(pi.tool_importers, {'ep1': eps[0].lv, 'ep3': eps[2].lv})
iep.assert_called_once_with('allura.importers')