incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From john...@apache.org
Subject [17/40] git commit: [#6708] Don't import CC field from trac
Date Thu, 31 Oct 2013 21:57:28 GMT
[#6708] Don't import CC field from trac

Signed-off-by: Tim Van Steenburgh <tvansteenburgh@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/9a9dccd5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/9a9dccd5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/9a9dccd5

Branch: refs/heads/cj/6714
Commit: 9a9dccd512040e6ac1344caac3ddb5d497624423
Parents: 73aef0a
Author: Tim Van Steenburgh <tvansteenburgh@gmail.com>
Authored: Wed Oct 23 21:33:46 2013 +0000
Committer: Cory Johns <cjohns@slashdotmedia.com>
Committed: Thu Oct 24 20:32:55 2013 +0000

----------------------------------------------------------------------
 ForgeTracker/forgetracker/import_support.py               | 1 +
 ForgeTracker/forgetracker/tests/functional/test_import.py | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/9a9dccd5/ForgeTracker/forgetracker/import_support.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/import_support.py b/ForgeTracker/forgetracker/import_support.py
index 1dc466c..9bf0d07 100644
--- a/ForgeTracker/forgetracker/import_support.py
+++ b/ForgeTracker/forgetracker/import_support.py
@@ -115,6 +115,7 @@ class ImportSupport(object):
             'status': True,
             'submitter': ('reported_by_id', self.get_user_id),
             'summary': True,
+            'cc': None,
         }
         self.user_map = {}
         self.warnings = []

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/9a9dccd5/ForgeTracker/forgetracker/tests/functional/test_import.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/functional/test_import.py b/ForgeTracker/forgetracker/tests/functional/test_import.py
index b352f0f..5d0a852 100644
--- a/ForgeTracker/forgetracker/tests/functional/test_import.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_import.py
@@ -20,7 +20,7 @@ import os
 import json
 from formencode.variabledecode import variable_encode
 from datetime import datetime, timedelta
-from nose.tools import assert_equal
+from nose.tools import assert_equal, assert_false
 
 import ming
 from pylons import app_globals as g
@@ -84,7 +84,7 @@ class TestImportController(TestRestApiBase):
         assert_equal(from_api['created_date'], self.time_normalize(org['date']))
         assert_equal(from_api['mod_date'], self.time_normalize(org['date_updated']))
         assert_equal(from_api['custom_fields']['_resolution'], org['resolution'])
-        assert_equal(from_api['custom_fields']['_cc'], org['cc'])
+        assert_false('_cc' in from_api['custom_fields'])
         assert_equal(from_api['custom_fields']['_private'], org['private'])
 
     @td.with_tracker


Mime
View raw message