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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: tools/telemetry/telemetry/results/buildbot_page_measurement_results_unittest.py

Issue 403093002: Merge all logic in PageMeasurementResults to PageTestResults. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 6 years, 5 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/perf/measurements/page_cycler_unittest.py ('K') | « tools/telemetry/telemetry/results/block_page_measurement_results_unittest.py ('k') | tools/telemetry/telemetry/results/csv_page_measurement_results_unittest.py » ('j') | tools/telemetry/telemetry/results/page_test_results.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/telemetry/telemetry/results/buildbot_page_measurement_results_unittest.py
diff --git a/tools/telemetry/telemetry/results/buildbot_page_measurement_results_unittest.py b/tools/telemetry/telemetry/results/buildbot_page_measurement_results_unittest.py
index 9080085df3f7dbbe0f65e586d718094932586f2a..455ffbc56d1daf8deef5ee6a24bb2e2430f30cdd 100644
--- a/tools/telemetry/telemetry/results/buildbot_page_measurement_results_unittest.py
+++ b/tools/telemetry/telemetry/results/buildbot_page_measurement_results_unittest.py
@@ -37,19 +37,17 @@ class BuildbotPageMeasurementResultsTest(
test_page_set = _MakePageSet()
measurement_results = SummarySavingPageMeasurementResults()
- measurement_results.WillMeasurePage(test_page_set.pages[0])
+ measurement_results.StartTest(test_page_set.pages[0])
measurement_results.AddValue(scalar.ScalarValue(
test_page_set.pages[0], 'a', 'seconds', 3))
-
- measurement_results.DidMeasurePage()
measurement_results.AddSuccess(test_page_set.pages[0])
+ measurement_results.StopTest(test_page_set.pages[0])
- measurement_results.WillMeasurePage(test_page_set.pages[1])
+ measurement_results.StartTest(test_page_set.pages[1])
measurement_results.AddValue(scalar.ScalarValue(
test_page_set.pages[1], 'a', 'seconds', 7))
-
- measurement_results.DidMeasurePage()
measurement_results.AddSuccess(test_page_set.pages[1])
+ measurement_results.StopTest(test_page_set.pages[1])
measurement_results.PrintSummary()
expected = ['RESULT a: http___www.bar.com_= 7 seconds',
@@ -66,11 +64,11 @@ class BuildbotPageMeasurementResultsTest(
test_page_set = _MakePageSet()
measurement_results = SummarySavingPageMeasurementResults()
- measurement_results.WillMeasurePage(test_page_set.pages[0])
+ measurement_results.StartTest(test_page_set.pages[0])
measurement_results.AddValue(scalar.ScalarValue(
test_page_set.pages[0], 'a', 'seconds', 3))
- measurement_results.DidMeasurePage()
measurement_results.AddSuccess(test_page_set.pages[0])
+ measurement_results.StopTest(test_page_set.pages[0])
measurement_results.PrintSummary()
expected = ['*RESULT a: a= 3 seconds',
@@ -84,28 +82,28 @@ class BuildbotPageMeasurementResultsTest(
test_page_set = _MakePageSet()
measurement_results = SummarySavingPageMeasurementResults()
- measurement_results.WillMeasurePage(test_page_set.pages[0])
+ measurement_results.StartTest(test_page_set.pages[0])
measurement_results.AddValue(scalar.ScalarValue(
test_page_set.pages[0], 'a', 'seconds', 3))
measurement_results.AddValue(
scalar.ScalarValue(test_page_set.pages[0], 'b', 'seconds', 10))
- measurement_results.DidMeasurePage()
measurement_results.AddSuccess(test_page_set.pages[0])
+ measurement_results.StopTest(test_page_set.pages[0])
- measurement_results.WillMeasurePage(test_page_set.pages[1])
+ measurement_results.StartTest(test_page_set.pages[1])
measurement_results.AddValue(scalar.ScalarValue(
test_page_set.pages[1], 'a', 'seconds', 3))
measurement_results.AddValue(scalar.ScalarValue(
test_page_set.pages[1], 'b', 'seconds', 10))
- measurement_results.DidMeasurePage()
measurement_results.AddSuccess(test_page_set.pages[1])
+ measurement_results.StopTest(test_page_set.pages[1])
- measurement_results.WillMeasurePage(test_page_set.pages[2])
+ measurement_results.StartTest(test_page_set.pages[2])
measurement_results.AddValue(scalar.ScalarValue(
test_page_set.pages[2], 'a', 'seconds', 7))
# Note, page[2] does not report a 'b' metric.
- measurement_results.DidMeasurePage()
measurement_results.AddSuccess(test_page_set.pages[2])
+ measurement_results.StopTest(test_page_set.pages[1])
measurement_results.PrintSummary()
expected = ['RESULT a: http___www.bar.com_= 3 seconds',
@@ -127,18 +125,18 @@ class BuildbotPageMeasurementResultsTest(
test_page_set = _MakePageSet()
measurement_results = SummarySavingPageMeasurementResults()
- measurement_results.WillMeasurePage(test_page_set.pages[0])
+ measurement_results.StartTest(test_page_set.pages[0])
measurement_results.AddValue(scalar.ScalarValue(
test_page_set.pages[0], 'a', 'seconds', 3))
- measurement_results.DidMeasurePage()
measurement_results.AddValue(
failure.FailureValue.FromMessage(test_page_set.pages[0], 'message'))
+ measurement_results.StopTest(test_page_set.pages[0])
- measurement_results.WillMeasurePage(test_page_set.pages[1])
+ measurement_results.StartTest(test_page_set.pages[1])
measurement_results.AddValue(scalar.ScalarValue(
test_page_set.pages[1], 'a', 'seconds', 7))
- measurement_results.DidMeasurePage()
measurement_results.AddSuccess(test_page_set.pages[1])
+ measurement_results.StopTest(test_page_set.pages[1])
measurement_results.PrintSummary()
expected = ['RESULT a: http___www.bar.com_= 7 seconds',
@@ -154,29 +152,29 @@ class BuildbotPageMeasurementResultsTest(
test_page_set = _MakePageSet()
measurement_results = SummarySavingPageMeasurementResults()
- measurement_results.WillMeasurePage(test_page_set.pages[0])
+ measurement_results.StartTest(test_page_set.pages[0])
measurement_results.AddValue(scalar.ScalarValue(
test_page_set.pages[0], 'a', 'seconds', 3))
- measurement_results.DidMeasurePage()
+ measurement_results.StopTest(test_page_set.pages[0])
- measurement_results.WillMeasurePage(test_page_set.pages[1])
+ measurement_results.StartTest(test_page_set.pages[1])
measurement_results.AddValue(scalar.ScalarValue(
test_page_set.pages[1], 'a', 'seconds', 7))
- measurement_results.DidMeasurePage()
measurement_results.AddValue(
failure.FailureValue.FromMessage(test_page_set.pages[1], 'message'))
+ measurement_results.StopTest(test_page_set.pages[1])
- measurement_results.WillMeasurePage(test_page_set.pages[0])
+ measurement_results.StartTest(test_page_set.pages[0])
measurement_results.AddValue(scalar.ScalarValue(
test_page_set.pages[0], 'a', 'seconds', 4))
- measurement_results.DidMeasurePage()
measurement_results.AddSuccess(test_page_set.pages[0])
+ measurement_results.StopTest(test_page_set.pages[0])
- measurement_results.WillMeasurePage(test_page_set.pages[1])
+ measurement_results.StartTest(test_page_set.pages[1])
measurement_results.AddValue(scalar.ScalarValue(
test_page_set.pages[1], 'a', 'seconds', 8))
- measurement_results.DidMeasurePage()
measurement_results.AddSuccess(test_page_set.pages[1])
+ measurement_results.StopTest(test_page_set.pages[1])
measurement_results.PrintSummary()
expected = ['RESULT a: http___www.bar.com_= [7,8] seconds\n' +
@@ -195,29 +193,29 @@ class BuildbotPageMeasurementResultsTest(
test_page_set = _MakePageSet()
measurement_results = SummarySavingPageMeasurementResults()
- measurement_results.WillMeasurePage(test_page_set.pages[0])
+ measurement_results.StartTest(test_page_set.pages[0])
measurement_results.AddValue(scalar.ScalarValue(
test_page_set.pages[0], 'a', 'seconds', 3))
- measurement_results.DidMeasurePage()
measurement_results.AddSuccess(test_page_set.pages[0])
+ measurement_results.StopTest(test_page_set.pages[0])
- measurement_results.WillMeasurePage(test_page_set.pages[1])
+ measurement_results.StartTest(test_page_set.pages[1])
measurement_results.AddValue(scalar.ScalarValue(
test_page_set.pages[1], 'a', 'seconds', 7))
- measurement_results.DidMeasurePage()
measurement_results.AddSuccess(test_page_set.pages[1])
+ measurement_results.StopTest(test_page_set.pages[1])
- measurement_results.WillMeasurePage(test_page_set.pages[0])
+ measurement_results.StartTest(test_page_set.pages[0])
measurement_results.AddValue(scalar.ScalarValue(
test_page_set.pages[0], 'a', 'seconds', 4))
- measurement_results.DidMeasurePage()
measurement_results.AddSuccess(test_page_set.pages[0])
+ measurement_results.StopTest(test_page_set.pages[0])
- measurement_results.WillMeasurePage(test_page_set.pages[1])
+ measurement_results.StartTest(test_page_set.pages[1])
measurement_results.AddValue(scalar.ScalarValue(
test_page_set.pages[1], 'a', 'seconds', 8))
- measurement_results.DidMeasurePage()
measurement_results.AddSuccess(test_page_set.pages[1])
+ measurement_results.StopTest(test_page_set.pages[1])
measurement_results.PrintSummary()
expected = ['RESULT a: http___www.bar.com_= [7,8] seconds\n' +
@@ -240,29 +238,29 @@ class BuildbotPageMeasurementResultsTest(
test_page_set = _MakePageSet()
measurement_results = SummarySavingPageMeasurementResults()
- measurement_results.WillMeasurePage(test_page_set.pages[0])
+ measurement_results.StartTest(test_page_set.pages[0])
measurement_results.AddValue(scalar.ScalarValue(
test_page_set.pages[0], 'a', 'seconds', 3))
- measurement_results.DidMeasurePage()
measurement_results.AddSuccess(test_page_set.pages[0])
+ measurement_results.StopTest(test_page_set.pages[0])
- measurement_results.WillMeasurePage(test_page_set.pages[0])
+ measurement_results.StartTest(test_page_set.pages[0])
measurement_results.AddValue(scalar.ScalarValue(
test_page_set.pages[0], 'a', 'seconds', 4))
- measurement_results.DidMeasurePage()
measurement_results.AddSuccess(test_page_set.pages[0])
+ measurement_results.StopTest(test_page_set.pages[0])
- measurement_results.WillMeasurePage(test_page_set.pages[1])
+ measurement_results.StartTest(test_page_set.pages[1])
measurement_results.AddValue(scalar.ScalarValue(
test_page_set.pages[1], 'a', 'seconds', 7))
- measurement_results.DidMeasurePage()
measurement_results.AddSuccess(test_page_set.pages[1])
+ measurement_results.StopTest(test_page_set.pages[1])
- measurement_results.WillMeasurePage(test_page_set.pages[1])
+ measurement_results.StartTest(test_page_set.pages[1])
measurement_results.AddValue(scalar.ScalarValue(
test_page_set.pages[1], 'a', 'seconds', 8))
- measurement_results.DidMeasurePage()
measurement_results.AddSuccess(test_page_set.pages[1])
+ measurement_results.StopTest(test_page_set.pages[1])
measurement_results.PrintSummary()
expected = ['RESULT a: http___www.bar.com_= [7,8] seconds\n' +
@@ -289,17 +287,17 @@ class BuildbotPageMeasurementResultsTest(
measurement_results.AddSummaryValue(
scalar.ScalarValue(None, 'a', 'seconds', 1))
- measurement_results.WillMeasurePage(test_page_set.pages[0])
+ measurement_results.StartTest(test_page_set.pages[0])
measurement_results.AddValue(scalar.ScalarValue(
test_page_set.pages[0], 'b', 'seconds', 2))
- measurement_results.DidMeasurePage()
measurement_results.AddSuccess(test_page_set.pages[0])
+ measurement_results.StopTest(test_page_set.pages[0])
- measurement_results.WillMeasurePage(test_page_set.pages[1])
+ measurement_results.StartTest(test_page_set.pages[1])
measurement_results.AddValue(scalar.ScalarValue(
test_page_set.pages[1], 'b', 'seconds', 3))
- measurement_results.DidMeasurePage()
measurement_results.AddSuccess(test_page_set.pages[1])
+ measurement_results.StopTest(test_page_set.pages[1])
measurement_results.AddSummaryValue(
scalar.ScalarValue(None, 'c', 'seconds', 4))
@@ -324,17 +322,17 @@ class BuildbotPageMeasurementResultsTest(
measurement_results.AddSummaryValue(
scalar.ScalarValue(None, 'a', 'seconds', 1))
- measurement_results.WillMeasurePage(test_page_set.pages[0])
+ measurement_results.StartTest(test_page_set.pages[0])
measurement_results.AddValue(scalar.ScalarValue(
test_page_set.pages[0], 'b', 'seconds', 2))
- measurement_results.DidMeasurePage()
measurement_results.AddSuccess(test_page_set.pages[0])
+ measurement_results.StopTest(test_page_set.pages[0])
- measurement_results.WillMeasurePage(test_page_set.pages[0])
+ measurement_results.StartTest(test_page_set.pages[0])
measurement_results.AddValue(scalar.ScalarValue(
test_page_set.pages[0], 'b', 'seconds', 3))
- measurement_results.DidMeasurePage()
measurement_results.AddSuccess(test_page_set.pages[0])
+ measurement_results.StopTest(test_page_set.pages[0])
measurement_results.PrintSummary()
@@ -356,17 +354,17 @@ class BuildbotPageMeasurementResultsTest(
measurement_results.AddSummaryValue(
scalar.ScalarValue(None, 'a', 'seconds', 1, important=False))
- measurement_results.WillMeasurePage(test_page_set.pages[0])
+ measurement_results.StartTest(test_page_set.pages[0])
measurement_results.AddValue(scalar.ScalarValue(
test_page_set.pages[0], 'b', 'seconds', 2, important=False))
- measurement_results.DidMeasurePage()
measurement_results.AddSuccess(test_page_set.pages[0])
+ measurement_results.StopTest(test_page_set.pages[0])
- measurement_results.WillMeasurePage(test_page_set.pages[1])
+ measurement_results.StartTest(test_page_set.pages[1])
measurement_results.AddValue(scalar.ScalarValue(
test_page_set.pages[1], 'b', 'seconds', 3, important=False))
- measurement_results.DidMeasurePage()
measurement_results.AddSuccess(test_page_set.pages[1])
+ measurement_results.StopTest(test_page_set.pages[1])
measurement_results.PrintSummary()
@@ -388,17 +386,17 @@ class BuildbotPageMeasurementResultsTest(
measurement_results.AddSummaryValue(
list_of_scalar_values.ListOfScalarValues(None, 'a', 'seconds', [1, 1]))
- measurement_results.WillMeasurePage(test_page_set.pages[0])
+ measurement_results.StartTest(test_page_set.pages[0])
measurement_results.AddValue(list_of_scalar_values.ListOfScalarValues(
test_page_set.pages[0], 'b', 'seconds', [2, 2]))
- measurement_results.DidMeasurePage()
measurement_results.AddSuccess(test_page_set.pages[0])
+ measurement_results.StopTest(test_page_set.pages[0])
- measurement_results.WillMeasurePage(test_page_set.pages[1])
+ measurement_results.StartTest(test_page_set.pages[1])
measurement_results.AddValue(list_of_scalar_values.ListOfScalarValues(
test_page_set.pages[1], 'b', 'seconds', [3, 3]))
- measurement_results.DidMeasurePage()
measurement_results.AddSuccess(test_page_set.pages[1])
+ measurement_results.StopTest(test_page_set.pages[1])
measurement_results.PrintSummary()
@@ -418,21 +416,21 @@ class BuildbotPageMeasurementResultsTest(
test_page_set = _MakePageSet()
measurement_results = SummarySavingPageMeasurementResults()
- measurement_results.WillMeasurePage(test_page_set.pages[0])
+ measurement_results.StartTest(test_page_set.pages[0])
measurement_results.AddValue(histogram.HistogramValue(
test_page_set.pages[0], 'a', 'units',
raw_value_json='{"buckets": [{"low": 1, "high": 2, "count": 1}]}',
important=False))
- measurement_results.DidMeasurePage()
measurement_results.AddSuccess(test_page_set.pages[0])
+ measurement_results.StopTest(test_page_set.pages[0])
- measurement_results.WillMeasurePage(test_page_set.pages[1])
+ measurement_results.StartTest(test_page_set.pages[1])
measurement_results.AddValue(histogram.HistogramValue(
test_page_set.pages[1], 'a', 'units',
raw_value_json='{"buckets": [{"low": 2, "high": 3, "count": 1}]}',
important=False))
- measurement_results.DidMeasurePage()
measurement_results.AddSuccess(test_page_set.pages[1])
+ measurement_results.StopTest(test_page_set.pages[1])
measurement_results.PrintSummary()
« tools/perf/measurements/page_cycler_unittest.py ('K') | « tools/telemetry/telemetry/results/block_page_measurement_results_unittest.py ('k') | tools/telemetry/telemetry/results/csv_page_measurement_results_unittest.py » ('j') | tools/telemetry/telemetry/results/page_test_results.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698