提交: 76cf08e8741986d04c84d197f7d02396068c6677 - allura (git)

allura

Commit MetaInfo

• 修訂: 76cf08e8741986d04c84d197f7d02396068c6677 (tree)
• 時間: 2011-04-29 00:34:05
• 作者: Dave Brondsema <dbrondsema@geek...>
• Commiter: Wolf

Log Message

[#2019] with latest Ming, require ticket_num to always be present

Signed-off-by: Dave Brondsema <[e-mail]>

Change Summary

• modified: ForgeTracker/forgetracker/model/ticket.py
• modified: ForgeTracker/forgetracker/tests/unit/test_ticket_model.py
• modified: requirements-common.txt

差異

--- a/ForgeTracker/forgetracker/model/ticket.py
+++ b/ForgeTracker/forgetracker/model/ticket.py
@@ -216,7 +216,7 @@ class Ticket(VersionedArtifact):
 
     super_id = FieldProperty(schema.ObjectId, if_missing=None)
     sub_ids = FieldProperty([schema.ObjectId], if_missing=None)
-    ticket_num = FieldProperty(int)
+    ticket_num = FieldProperty(int, required=True)
     summary = FieldProperty(str)
     description = FieldProperty(str, if_missing='')
     reported_by_id = ForeignIdProperty(User, if_missing=lambda:c.user._id)

--- a/ForgeTracker/forgetracker/tests/unit/test_ticket_model.py
+++ b/ForgeTracker/forgetracker/tests/unit/test_ticket_model.py
@@ -1,4 +1,6 @@
 from ming.orm.ormsession import ThreadLocalORMSession
+from ming import schema
+from nose.tools import raises, assert_raises
 
 from forgetracker.model import Ticket
 from forgetracker.tests.unit import TrackerTestWithModel
@@ -7,8 +9,20 @@ from forgetracker.tests.unit import TrackerTestWithModel
 class TestTicketModel(TrackerTestWithModel):
     def test_that_it_has_ordered_custom_fields(self):
         custom_fields = dict(my_field='my value')
-        Ticket(summary='my ticket', custom_fields=custom_fields)
+        Ticket(summary='my ticket', custom_fields=custom_fields, ticket_num=3)
         ThreadLocalORMSession.flush_all()
         ticket = Ticket.query.get(summary='my ticket')
         assert ticket.custom_fields == dict(my_field='my value')
 
+    @raises(schema.Invalid)
+    def test_ticket_num_required(self):
+        Ticket(summary='my ticket')
+
+    def test_ticket_num_required2(self):
+        t = Ticket(summary='my ticket', ticket_num=3)
+        try:
+            t.ticket_num = None
+        except schema.Invalid:
+            pass
+        else:
+            raise AssertionError('Expected schema.Invalid to be thrown')

--- a/requirements-common.txt
+++ b/requirements-common.txt
@@ -23,7 +23,7 @@ Mako==0.3.2
 Markdown==2.0.3
 MarkupSafe==0.11
 mercurial==1.4.1
-Ming==0.2.1dev-20110412
+Ming==0.2.1dev-20110428
 mock==0.6.0
 nose==0.11.3
 oauth2==1.2.0