incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From john...@apache.org
Subject [01/50] git commit: [#6100] ticket:431 Remove commented code and expand test
Date Tue, 24 Sep 2013 17:07:40 GMT
Updated Branches:
  refs/heads/cj/6422 b081c5dda -> 05ff83e59 (forced update)


[#6100] ticket:431 Remove commented code and expand test


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/671627eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/671627eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/671627eb

Branch: refs/heads/cj/6422
Commit: 671627eb5bd3838974014b14da84b3308ca43b39
Parents: e2f3e82
Author: Igor Bondarenko <jetmind2@gmail.com>
Authored: Thu Sep 12 15:32:00 2013 +0300
Committer: Tim Van Steenburgh <tvansteenburgh@gmail.com>
Committed: Wed Sep 18 14:40:14 2013 +0000

----------------------------------------------------------------------
 ForgeTracker/forgetracker/model/ticket.py               | 2 --
 ForgeTracker/forgetracker/tests/functional/test_root.py | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/671627eb/ForgeTracker/forgetracker/model/ticket.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/model/ticket.py b/ForgeTracker/forgetracker/model/ticket.py
index 03ee03f..0ef8cab 100644
--- a/ForgeTracker/forgetracker/model/ticket.py
+++ b/ForgeTracker/forgetracker/model/ticket.py
@@ -898,8 +898,6 @@ class Ticket(VersionedArtifact, ActivityObject, VotableArtifact):
             if old_val is None:
                 custom_fields[fn] = None if ft == 'user' else ''
             custom_fields[fn] = old_val
-        # custom_fields['moved_from_app'] = prior_app.config._id
-        # custom_fields['moved_from_id'] = self.ticket_num
         self.custom_fields = custom_fields
 
         # move ticket. ensure unique ticket_num

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/671627eb/ForgeTracker/forgetracker/tests/functional/test_root.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/functional/test_root.py b/ForgeTracker/forgetracker/tests/functional/test_root.py
index 8632e29..823ec28 100644
--- a/ForgeTracker/forgetracker/tests/functional/test_root.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_root.py
@@ -1769,7 +1769,8 @@ class TestFunctionalController(TrackerTestController):
 
         # remaining tickets in 'bugs' tracker should still be viewable
         self.app.get('/p/test/bugs/2/', status=200)  # shouldn't fail
-        self.app.get('/p/test/bugs/1/', status=301)  # ticket counts as moved
+        r = self.app.get('/p/test/bugs/1/', status=301)  # ticket counts as moved
+        r.follow(status=404)  # and not found 'cause already deleted
 
     @td.with_tool('test', 'Tickets', 'dummy')
     def test_move_ticket_email_notifications(self):


Mime
View raw message