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 2013/08/21 18:06:12 UTC
[20/25] git commit: [#6464] Fixed Open/Closed search bins on GC
Tracker importer
[#6464] Fixed Open/Closed search bins on GC Tracker importer
Signed-off-by: Cory Johns <cj...@slashdotmedia.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/ef4918b1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/ef4918b1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/ef4918b1
Branch: refs/heads/master
Commit: ef4918b1b729b894b29642410d265e1f732c6819
Parents: 3848b1e
Author: Cory Johns <cj...@slashdotmedia.com>
Authored: Tue Aug 20 20:27:33 2013 +0000
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Tue Aug 20 20:27:33 2013 +0000
----------------------------------------------------------------------
ForgeImporters/forgeimporters/google/tracker.py | 8 +++++---
.../tests/google/functional/test_tracker.py | 20 ++++++++++++++++++++
.../forgeimporters/tests/google/test_tracker.py | 6 +++++-
ForgeTracker/forgetracker/tracker_main.py | 4 ++--
4 files changed, 32 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ef4918b1/ForgeImporters/forgeimporters/google/tracker.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/google/tracker.py b/ForgeImporters/forgeimporters/google/tracker.py
index 49f052b..fb2c845 100644
--- a/ForgeImporters/forgeimporters/google/tracker.py
+++ b/ForgeImporters/forgeimporters/google/tracker.py
@@ -45,9 +45,11 @@ class GoogleCodeTrackerImporter(ToolImporter):
def import_tool(self, project, user, project_name, mount_point=None,
mount_label=None, **kw):
- app = project.install_app('tickets', mount_point, mount_label, EnableVoting=True)
- app.globals.open_status_names = 'New Accepted Started'
- app.globals.closed_status_names = 'Fixed Verified Invalid Duplicate WontFix Done'
+ app = project.install_app('tickets', mount_point, mount_label,
+ EnableVoting=True,
+ open_status_names='New Accepted Started',
+ closed_status_names='Fixed Verified Invalid Duplicate WontFix Done',
+ )
ThreadLocalORMSession.flush_all()
self.open_milestones = set()
self.custom_fields = {}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ef4918b1/ForgeImporters/forgeimporters/tests/google/functional/test_tracker.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/tests/google/functional/test_tracker.py b/ForgeImporters/forgeimporters/tests/google/functional/test_tracker.py
index b4f9a86..d2e423c 100644
--- a/ForgeImporters/forgeimporters/tests/google/functional/test_tracker.py
+++ b/ForgeImporters/forgeimporters/tests/google/functional/test_tracker.py
@@ -76,6 +76,24 @@ class TestGCTrackerImporter(TestCase):
self.assertEqual(ticket.milestone, '')
self.assertEqual(ticket.custom_fields, {})
assert c.app.config.options.get('EnableVoting')
+ open_bin = TM.Bin.query.get(summary='Open Tickets', app_config_id=c.app.config._id)
+ self.assertItemsEqual(open_bin.terms.split(' && '), [
+ '!status:Fixed',
+ '!status:Verified',
+ '!status:Invalid',
+ '!status:Duplicate',
+ '!status:WontFix',
+ '!status:Done',
+ ])
+ closed_bin = TM.Bin.query.get(summary='Closed Tickets', app_config_id=c.app.config._id)
+ self.assertItemsEqual(closed_bin.terms.split(' or '), [
+ 'status:Fixed',
+ 'status:Verified',
+ 'status:Invalid',
+ 'status:Duplicate',
+ 'status:WontFix',
+ 'status:Done',
+ ])
@without_module('html2text')
def test_issue_basic_fields(self):
@@ -220,6 +238,8 @@ class TestGCTrackerImporter(TestCase):
def test_globals(self):
globals = self._make_ticket(self.test_issue).globals
+ self.assertEqual(globals.open_status_names, 'New Accepted Started')
+ self.assertEqual(globals.closed_status_names, 'Fixed Verified Invalid Duplicate WontFix Done')
self.assertItemsEqual(globals.custom_fields, [
{
'label': 'Milestone',
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ef4918b1/ForgeImporters/forgeimporters/tests/google/test_tracker.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/tests/google/test_tracker.py b/ForgeImporters/forgeimporters/tests/google/test_tracker.py
index ac50624..3d0774f 100644
--- a/ForgeImporters/forgeimporters/tests/google/test_tracker.py
+++ b/ForgeImporters/forgeimporters/tests/google/test_tracker.py
@@ -45,7 +45,11 @@ class TestTrackerImporter(TestCase):
importer.import_tool(project, user, project_name='project_name',
mount_point='mount_point', mount_label='mount_label')
- project.install_app.assert_called_once_with('tickets', 'mount_point', 'mount_label', EnableVoting=True)
+ project.install_app.assert_called_once_with('tickets', 'mount_point', 'mount_label',
+ EnableVoting=True,
+ open_status_names='New Accepted Started',
+ closed_status_names='Fixed Verified Invalid Duplicate WontFix Done',
+ )
gpe.iter_issues.assert_called_once_with('project_name')
self.assertEqual(importer.process_fields.call_args_list, [
mock.call(tickets[0], issues[0]),
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ef4918b1/ForgeTracker/forgetracker/tracker_main.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tracker_main.py b/ForgeTracker/forgetracker/tracker_main.py
index 2b432df..cc28879 100644
--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -379,8 +379,8 @@ class ForgeTrackerApp(Application):
]
self.globals = TM.Globals(app_config_id=c.app.config._id,
last_ticket_num=0,
- open_status_names='open unread accepted pending',
- closed_status_names='closed wont-fix',
+ open_status_names=self.config.options.get('open_status_names', 'open unread accepted pending'),
+ closed_status_names=self.config.options.get('closed_status_names', 'closed wont-fix'),
custom_fields=[dict(
name='_milestone',
label='Milestone',