Changeset 113356 in webkit

Timestamp:

Apr 5, 2012 12:32:27 PM (12 years ago)

Author:

rniwa@webkit.org

Message:

perf-o-matic should include unit in runs JSON responses
​https://bugs.webkit.org/show_bug.cgi?id=83294

Reviewed by Tony Chang.

This is a follow up to r112829. Report the unit in /api/test/runs so that the frontend can show it.
Fixed a bug in Test.update_or_insert that it didn't store the unit when it first created the Test object.

Also increment perf-o-matic's version to 18.

• Websites/webkit-perf.appspot.com/app.yaml: Incremented the version.
• Websites/webkit-perf.appspot.com/models.py:

(Test.update_or_insert.execute): Store unit when creating a test.
(Runs.to_json): Include unit.

• Websites/webkit-perf.appspot.com/models_unittest.py: Added tests.

(TestModelTests.test_update_or_insert_with_unit):
(RunsTest.test_to_json_without_results):
(RunsTest.test_to_json_with_results):
(RunsTest.test_to_json_with_unit):

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Websites/webkit-perf.appspot.com/app.yaml (modified) (1 diff)
• Websites/webkit-perf.appspot.com/models.py (modified) (2 diffs)
• Websites/webkit-perf.appspot.com/models_unittest.py (modified) (4 diffs)

trunk/ChangeLog

@@ +1 @@
+2012-04-05  Ryosuke Niwa  <rniwa@webkit.org>
+
+        perf-o-matic should include unit in runs JSON responses
+        https://bugs.webkit.org/show_bug.cgi?id=83294
+
+        Reviewed by Tony Chang.
+
+        This is a follow up to r112829. Report the unit in /api/test/runs so that the frontend can show it.
+        Fixed a bug in Test.update_or_insert that it didn't store the unit when it first created the Test object.
+
+        Also increment perf-o-matic's version to 18.
+
+        * Websites/webkit-perf.appspot.com/app.yaml: Incremented the version.
+        * Websites/webkit-perf.appspot.com/models.py:
+        (Test.update_or_insert.execute): Store unit when creating a test.
+        (Runs.to_json): Include unit.
+        * Websites/webkit-perf.appspot.com/models_unittest.py: Added tests.
+        (TestModelTests.test_update_or_insert_with_unit):
+        (RunsTest.test_to_json_without_results):
+        (RunsTest.test_to_json_with_results):
+        (RunsTest.test_to_json_with_unit):
+
 2012-03-14  Antonio Gomes  <agomes@rim.com>
 

trunk/Websites/webkit-perf.appspot.com/app.yaml

@@ -1 +1 @@
 application: webkit-perf
-version: 17
+version: 18
 runtime: python27
 api_version: 1

trunk/Websites/webkit-perf.appspot.com/models.py

@@ -168 +168 @@
                 return None
 
-            test = Test(id=id, name=test_name, key_name=test_name, branches=[branch.key()], platforms=[platform.key()])
+            test = Test(id=id, name=test_name, key_name=test_name, unit=unit, branches=[branch.key()], platforms=[platform.key()])
             test.put()
             return test
@@ -449 +449 @@
     def to_json(self):
         # date_range is never used by common.js.
-        return '{"test_runs": [%s], "averages": {%s}, "min": %s, "max": %s, "date_range": null, "stat": "ok"}' % (self.json_runs,
-            self.json_averages, str(self.json_min) if self.json_min else 'null', str(self.json_max) if self.json_max else 'null')
+        return '{"test_runs": [%s], "averages": {%s}, "min": %s, "max": %s, "unit": %s, "date_range": null, "stat": "ok"}' % (self.json_runs,
+            self.json_averages, str(self.json_min) if self.json_min else 'null', str(self.json_max) if self.json_max else 'null',
+            '"%s"' % self.test.unit if self.test.unit else 'null')
 
     def chart_params(self, display_days, now=datetime.now().replace(hour=12, minute=0, second=0, microsecond=0)):

trunk/Websites/webkit-perf.appspot.com/models_unittest.py

@@ -269 +269 @@
         self.assertOnlyInstance(test)
 
+    def test_update_or_insert_with_unit(self):
+        branch = Branch.create_if_possible('some-branch', 'Some Branch')
+        platform = Platform.create_if_possible('some-platform', 'Some Platform')
+        test = Test.update_or_insert('some-test', branch, platform, 'runs/s')
+        self.assertOnlyInstance(test)
+        self.assertEqualUnorderedList(test.unit, 'runs/s')
+
     def test_update_or_insert_to_update(self):
         branch = Branch.create_if_possible('some-branch', 'Some Branch')
@@ -661 +668 @@
             'min': None,
             'max': None,
+            'unit': None,
             'date_range': None,
             'stat': 'ok'})
@@ -672 +680 @@
 
         value = json.loads(Runs.update_or_insert(some_branch, some_platform, some_test).to_json())
-        self.assertEqualUnorderedList(value.keys(), ['test_runs', 'averages', 'min', 'max', 'date_range', 'stat'])
+        self.assertEqualUnorderedList(value.keys(), ['test_runs', 'averages', 'min', 'max', 'unit', 'date_range', 'stat'])
         self.assertEqual(value['stat'], 'ok')
         self.assertEqual(value['min'], 48.0)
         self.assertEqual(value['max'], 52.0)
+        self.assertEqual(value['unit'], None)
         self.assertEqual(value['date_range'], None)  # date_range is never given
 
@@ -689 +698 @@
             self.assertEqual(run[7], None)  # Statistics
 
+    def test_to_json_with_unit(self):
+        some_branch = Branch.create_if_possible('some-branch', 'Some Branch')
+        some_platform = Platform.create_if_possible('some-platform', 'Some Platform')
+        some_builder = Builder.get(Builder.create('some-builder', 'Some Builder'))
+        some_test = Test.update_or_insert('some-test', some_branch, some_platform, 'runs/s')
+        builds, results = self._create_results(some_branch, some_platform, some_builder, 'some-test', [50.0, 51.0, 52.0, 49.0, 48.0])
+
+        value = json.loads(Runs.update_or_insert(some_branch, some_platform, some_test).to_json())
+        self.assertEqual(value['unit'], 'runs/s')
+
     def _assert_entry(self, entry, build, result, value, statistics=None, supplementary_revisions=None):
         entry = entry[:]