Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(192)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: tools/telemetry/telemetry/page/html_page_measurement_results_unittest.py

Issue 27486002: Cleanup of page_measurement_results object (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 500d Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« tools/telemetry/telemetry/page/buildbot_page_measurement_results_unittest.py ('K') | « tools/telemetry/telemetry/page/html_page_measurement_results.py ('k') | tools/telemetry/telemetry/page/page.py » ('j') | tools/telemetry/telemetry/page/page.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/telemetry/telemetry/page/html_page_measurement_results_unittest.py
diff --git a/tools/telemetry/telemetry/page/html_page_measurement_results_unittest.py b/tools/telemetry/telemetry/page/html_page_measurement_results_unittest.py
index 5a0b8e28d90994b02c04c5137f508c3b3a24cef4..cdad5a4c7a5a3970969c0bbdf759ecb3a2f406ba 100644
--- a/tools/telemetry/telemetry/page/html_page_measurement_results_unittest.py
+++ b/tools/telemetry/telemetry/page/html_page_measurement_results_unittest.py
@@ -52,51 +52,52 @@ class HtmlPageMeasurementResultsTest(unittest.TestCase):
results.WillMeasurePage(test_page_set.pages[0])
results.Add('a', 'seconds', 3)
results.DidMeasurePage()
+ results.AddSuccess(test_page_set.pages[0])
+
results.WillMeasurePage(test_page_set.pages[1])
results.Add('a', 'seconds', 7)
results.DidMeasurePage()
+ results.AddSuccess(test_page_set.pages[1])
results.PrintSummary()
- expected = (
- '<script id="results-json" type="application/json">'
- '[{'
- '"platform": "browser_type", '
- '"buildTime": "build_time", '
- '"tests": {'
- '"test_name": {'
- '"metrics": {'
- '"a": {'
- '"current": [3, 7], '
- '"units": "seconds", '
- '"important": true'
- '}, '
- '"telemetry_page_measurement_results.num_failed": {'
- '"current": [0], '
- '"units": "count", '
- '"important": false'
- '}, '
- '"a_by_url.http://www.bar.com/": {'
- '"current": [7], '
- '"units": "seconds", '
- '"important": false'
- '}, '
- '"telemetry_page_measurement_results.num_errored": {'
- '"current": [0], '
- '"units": "count", '
- '"important": false'
- '}, '
- '"a_by_url.http://www.foo.com/": {'
- '"current": [3], '
- '"units": "seconds", '
- '"important": false'
- '}'
- '}'
- '}'
- '}, '
- '"revision": "revision"'
- '}]'
- '</script>')
- self.assertIn(expected, output_file.getvalue())
+ results.GetResults()
+ expected = {
+ "platform": "browser_type",
+ "buildTime": "build_time",
+ "tests": {
+ "test_name": {
+ "metrics": {
+ "a": {
+ "current": [7, 3],
+ "units": "seconds",
+ "important": True
+ },
+ "telemetry_page_measurement_results.num_failed": {
+ "current": [0],
+ "units": "count",
+ "important": False
+ },
+ "a_by_url.http://www.bar.com/": {
+ "current": [7],
+ "units": "seconds",
+ "important": False
+ },
+ "telemetry_page_measurement_results.num_errored": {
+ "current": [0],
+ "units": "count",
+ "important": False
+ },
+ "a_by_url.http://www.foo.com/": {
+ "current": [3],
+ "units": "seconds",
+ "important": False
+ }
+ }
+ }
+ },
+ "revision": "revision"
+ }
+ self.assertEquals(expected, results.GetResults())
# Run the second time and verify the results are appended to the HTML file.
output_file.seek(0)
@@ -105,87 +106,88 @@ class HtmlPageMeasurementResultsTest(unittest.TestCase):
results.WillMeasurePage(test_page_set.pages[0])
results.Add('a', 'seconds', 4)
results.DidMeasurePage()
+ results.AddSuccess(test_page_set.pages[0])
+
results.WillMeasurePage(test_page_set.pages[1])
results.Add('a', 'seconds', 8)
results.DidMeasurePage()
+ results.AddSuccess(test_page_set.pages[1])
results.PrintSummary()
- expected = (
- '<script id="results-json" type="application/json">'
- '[{'
- '"platform": "browser_type", '
- '"buildTime": "build_time", '
- '"tests": {'
- '"test_name": {'
- '"metrics": {'
- '"a": {'
- '"current": [3, 7], '
- '"units": "seconds", '
- '"important": true'
- '}, '
- '"telemetry_page_measurement_results.num_failed": {'
- '"current": [0], '
- '"units": "count", '
- '"important": false'
- '}, '
- '"a_by_url.http://www.bar.com/": {'
- '"current": [7], '
- '"units": "seconds", '
- '"important": false'
- '}, '
- '"telemetry_page_measurement_results.num_errored": {'
- '"current": [0], '
- '"units": "count", '
- '"important": false'
- '}, '
- '"a_by_url.http://www.foo.com/": {'
- '"current": [3], '
- '"units": "seconds", '
- '"important": false'
- '}'
- '}'
- '}'
- '}, '
- '"revision": "revision"'
- '}, '
- '{'
- '"platform": "browser_type", '
- '"buildTime": "build_time", '
- '"tests": {'
- '"test_name": {'
- '"metrics": {'
- '"a": {'
- '"current": [4, 8], '
- '"units": "seconds", '
- '"important": true'
- '}, '
- '"telemetry_page_measurement_results.num_failed": {'
- '"current": [0], '
- '"units": "count", '
- '"important": false'
- '}, '
- '"a_by_url.http://www.bar.com/": {'
- '"current": [8], '
- '"units": "seconds", '
- '"important": false'
- '}, '
- '"telemetry_page_measurement_results.num_errored": {'
- '"current": [0], '
- '"units": "count", '
- '"important": false'
- '}, '
- '"a_by_url.http://www.foo.com/": {'
- '"current": [4], '
- '"units": "seconds", '
- '"important": false'
- '}'
- '}'
- '}'
- '}, '
- '"revision": "revision"'
- '}]'
- '</script>')
- self.assertIn(expected, output_file.getvalue())
+ expected = [
+ {
+ "platform": "browser_type",
+ "buildTime": "build_time",
+ "tests": {
+ "test_name": {
+ "metrics": {
+ "a": {
+ "current": [7, 3],
+ "units": "seconds",
+ "important": True
+ },
+ "telemetry_page_measurement_results.num_failed": {
+ "current": [0],
+ "units": "count",
+ "important": False
+ },
+ "a_by_url.http://www.bar.com/": {
+ "current": [7],
+ "units": "seconds",
+ "important": False
+ },
+ "telemetry_page_measurement_results.num_errored": {
+ "current": [0],
+ "units": "count",
+ "important": False
+ },
+ "a_by_url.http://www.foo.com/": {
+ "current": [3],
+ "units": "seconds",
+ "important": False
+ }
+ }
+ }
+ },
+ "revision": "revision"
+ },
+ {
+ "platform": "browser_type",
+ "buildTime": "build_time",
+ "tests": {
+ "test_name": {
+ "metrics": {
+ "a": {
+ "current": [8, 4],
+ "units": "seconds",
+ "important": True
+ },
+ "telemetry_page_measurement_results.num_failed": {
+ "current": [0],
+ "units": "count",
+ "important": False,
+ },
+ "a_by_url.http://www.bar.com/": {
+ "current": [8],
+ "units": "seconds",
+ "important": False
+ },
+ "telemetry_page_measurement_results.num_errored": {
+ "current": [0],
+ "units": "count",
+ "important": False
+ },
+ "a_by_url.http://www.foo.com/": {
+ "current": [4],
+ "units": "seconds",
+ "important": False
+ }
+ }
+ }
+ },
+ "revision": "revision"
+ }]
+ self.assertEquals(expected, results.GetCombinedResults())
last_output_len = len(output_file.getvalue())
# Now reset the results and verify the old ones are gone.
@@ -195,49 +197,49 @@ class HtmlPageMeasurementResultsTest(unittest.TestCase):
results.WillMeasurePage(test_page_set.pages[0])
results.Add('a', 'seconds', 5)
results.DidMeasurePage()
+ results.AddSuccess(test_page_set.pages[0])
+
results.WillMeasurePage(test_page_set.pages[1])
results.Add('a', 'seconds', 9)
results.DidMeasurePage()
+ results.AddSuccess(test_page_set.pages[1])
results.PrintSummary()
- expected = (
- '<script id="results-json" type="application/json">'
- '[{'
- '"platform": "browser_type", '
- '"buildTime": "build_time", '
- '"tests": {'
- '"test_name": {'
- '"metrics": {'
- '"a": {'
- '"current": [5, 9], '
- '"units": "seconds", '
- '"important": true'
- '}, '
- '"telemetry_page_measurement_results.num_failed": {'
- '"current": [0], '
- '"units": "count", '
- '"important": false'
- '}, '
- '"a_by_url.http://www.bar.com/": {'
- '"current": [9], '
- '"units": "seconds", '
- '"important": false'
- '}, '
- '"telemetry_page_measurement_results.num_errored": {'
- '"current": [0], '
- '"units": "count", '
- '"important": false'
- '}, '
- '"a_by_url.http://www.foo.com/": {'
- '"current": [5], '
- '"units": "seconds", '
- '"important": false'
- '}'
- '}'
- '}'
- '}, '
- '"revision": "revision"'
- '}]'
- '</script>')
- self.assertIn(expected, output_file.getvalue())
+ expected = [{
+ "platform": "browser_type",
+ "buildTime": "build_time",
+ "tests": {
+ "test_name": {
+ "metrics": {
+ "a": {
+ "current": [9, 5],
+ "units": "seconds",
+ "important": True
+ },
+ "telemetry_page_measurement_results.num_failed": {
+ "current": [0],
+ "units": "count",
+ "important": False
+ },
+ "a_by_url.http://www.bar.com/": {
+ "current": [9],
+ "units": "seconds",
+ "important": False
+ },
+ "telemetry_page_measurement_results.num_errored": {
+ "current": [0],
+ "units": "count",
+ "important": False
+ },
+ "a_by_url.http://www.foo.com/": {
+ "current": [5],
+ "units": "seconds",
+ "important": False
+ }
+ }
+ }
+ },
+ "revision": "revision"
+ }]
+ self.assertEquals(expected, results.GetCombinedResults())
self.assertTrue(len(output_file.getvalue()) < last_output_len)
« tools/telemetry/telemetry/page/buildbot_page_measurement_results_unittest.py ('K') | « tools/telemetry/telemetry/page/html_page_measurement_results.py ('k') | tools/telemetry/telemetry/page/page.py » ('j') | tools/telemetry/telemetry/page/page.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698