Changeset 84216 in webkit

Timestamp:

Apr 18, 2011 8:11:20 PM (13 years ago)

Author:

eric@webkit.org

Message:

2011-04-18 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

test-webkitpy should run the ActiveWorkItems tests
​https://bugs.webkit.org/show_bug.cgi?id=58859

Also make the unit tests pass. :)

• QueueStatusServer/model/activeworkitems.py:
• QueueStatusServer/model/queue.py:
• QueueStatusServer/model/workitems.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• QueueStatusServer/model/activeworkitems.py (modified) (1 diff)
• QueueStatusServer/model/activeworkitems_unittest.py (moved) (moved from trunk/Tools/QueueStatusServer/model/activeworkitems_unitest.py) (3 diffs)
• QueueStatusServer/model/queues.py (modified) (1 diff)
• QueueStatusServer/model/workitems.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-18  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        test-webkitpy should run the ActiveWorkItems tests
+        https://bugs.webkit.org/show_bug.cgi?id=58859
+
+        Also make the unit tests pass. :)
+
+        * QueueStatusServer/model/activeworkitems.py:
+        * QueueStatusServer/model/queue.py:
+        * QueueStatusServer/model/workitems.py:
+
 2011-04-18  Eric Seidel  <eric@webkit.org>
 

trunk/Tools/QueueStatusServer/model/activeworkitems.py

@@ -62 +62 @@
         self._set_item_time_pairs(nonexpired_pairs)
 
+    @classmethod
+    def key_for_queue(cls, queue_name):
+        return "active-work-items-%s" % (queue_name)
+
+    @classmethod
+    def lookup_by_queue(cls, queue_name):
+        return cls.get_or_insert(key_name=cls.key_for_queue(queue_name), queue_name=queue_name)
+
     @staticmethod
     def _expire_item(key, item_id):

trunk/Tools/QueueStatusServer/model/activeworkitems_unittest.py

@@ -29 +29 @@
 import unittest
 from datetime import datetime
+from google.appengine.ext import testbed
 
 from model.activeworkitems import ActiveWorkItems
@@ -34 +35 @@
 
 class ActiveWorkItemsTest(unittest.TestCase):
+
+    def setUp(self):
+        self.testbed = testbed.Testbed()
+        self.testbed.activate()
+        self.testbed.init_datastore_v3_stub()
+        self.testbed.init_memcache_stub()
+
+    def tearDown(self):
+        self.testbed.deactivate()
+
     def test_basic(self):
-        items = ActiveWorkItems()
+        items = ActiveWorkItems.lookup_by_queue("test-queue")
         queued_items = [1, 2]
-        time = datetime.now()
+        # db.Model only stores dates to second resolution, so we use an explicit datetime without milliseconds.
+        time = datetime(2011, 4, 18, 18, 50, 44)
         self.assertEqual(items.next_item(queued_items, time), 1)
         self.assertEqual(items.next_item([1], time), None)
@@ -46 +58 @@
 
         items.expire_item(1)
+        # expire_item uses a transaction so it doesn't take effect on the current object.
+        self.assertEqual(items.time_for_item(1), time)
+        # If we look up the saved object, we see it's been updated.
+        items = ActiveWorkItems.lookup_by_queue("test-queue")
         self.assertEqual(items.time_for_item(1), None)
-
-
-if __name__ == '__main__':
-    unittest.main()

trunk/Tools/QueueStatusServer/model/queues.py

@@ -71 +71 @@
 
     def work_items(self):
-        key_name = "work-items-%s" % (self._name)
-        return WorkItems.get_or_insert(key_name=key_name, queue_name=self._name)
+        return WorkItems.lookup_by_queue(self._name)
 
     # FIXME: active_work_items is a bad name for this lock-table.
     def active_work_items(self):
-        key_name = "active-work-items-%s" % (self._name)
-        return ActiveWorkItems.get_or_insert(key_name=key_name, queue_name=self._name)
+        return ActiveWorkItems.lookup_by_queue(self._name)
 
     def _caplitalize_after_dash(self, string):

trunk/Tools/QueueStatusServer/model/workitems.py

@@ -37 +37 @@
     date = db.DateTimeProperty(auto_now_add=True)
 
+    @classmethod
+    def key_for_queue(cls, queue_name):
+        return "work-items-%s" % (queue_name)
+
+    @classmethod
+    def lookup_by_queue(cls, queue_name):
+        return cls.get_or_insert(key_name=cls.key_for_queue(queue_name), queue_name=queue_name)
+
     def display_position_for_attachment(self, attachment_id):
         """Returns a 1-based index corresponding to the position