Skip to content

GitLab

T
tangled
Commit 0a3c84d8 authored by nednguyen@google.com's avatar nednguyen@google.com
Browse files
Options

Update files in telemetry/results/ to use results.AddValue 

BUG=346958

Review URL: https://codereview.chromium.org/385983009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282762 0039d316-1c4b-4281-b951-d872f2087c98
parent 663fafcf
Hide whitespace changes
Inline Side-by-side
Showing with 142 additions and 84 deletions
tools/telemetry/telemetry/results/block_page_measurement_results_unittest.py
View file @ 0a3c84d8
......@@ -7,6 +7,7 @@ import unittest
from telemetry.page import page_set
from telemetry.results import block_page_measurement_results
from telemetry.value import scalar
BlockPageMeasurementResults = \
......@@ -43,11 +44,13 @@ class BlockPageMeasurementResultsTest(unittest.TestCase):
def test_with_output_after_every_page(self):
results = NonPrintingBlockPageMeasurementResults(self._output)
results.WillMeasurePage(self._page_set[0])
results.Add('foo', 'seconds', 3)
results.AddValue(
scalar.ScalarValue(self._page_set[0], 'foo', 'seconds', 3))
results.DidMeasurePage()
results.WillMeasurePage(self._page_set[1])
results.Add('bar', 'seconds', 4)
results.AddValue(
scalar.ScalarValue(self._page_set[1], 'bar', 'seconds', 4))
results.DidMeasurePage()
expected = [
......
tools/telemetry/telemetry/results/buildbot_page_measurement_results_unittest.py
View file @ 0a3c84d8
......@@ -5,11 +5,13 @@ import os
from telemetry import perf_tests_helper
from telemetry.page import page_set
from telemetry.value import histogram
from telemetry.value import list_of_scalar_values
from telemetry.value import scalar
from telemetry.results import base_test_results_unittest
from telemetry.results import buildbot_page_measurement_results
def _MakePageSet():
ps = page_set.PageSet(file_path=os.path.dirname(__file__))
ps.AddPageWithDefaultRunNavigate('http://www.foo.com/')
......@@ -35,12 +37,16 @@ class BuildbotPageMeasurementResultsTest(
measurement_results = SummarySavingPageMeasurementResults()
measurement_results.WillMeasurePage(test_page_set.pages[0])
measurement_results.Add('a', 'seconds', 3)
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.WillMeasurePage(test_page_set.pages[1])
measurement_results.Add('a', 'seconds', 7)
measurement_results.AddValue(scalar.ScalarValue(
test_page_set.pages[1], 'a', 'seconds', 7))
measurement_results.DidMeasurePage()
measurement_results.AddSuccess(test_page_set.pages[1])
......@@ -60,7 +66,8 @@ class BuildbotPageMeasurementResultsTest(
measurement_results = SummarySavingPageMeasurementResults()
measurement_results.WillMeasurePage(test_page_set.pages[0])
measurement_results.Add('a', 'seconds', 3)
measurement_results.AddValue(scalar.ScalarValue(
test_page_set.pages[0], 'a', 'seconds', 3))
measurement_results.DidMeasurePage()
measurement_results.AddSuccess(test_page_set.pages[0])
......@@ -77,19 +84,24 @@ class BuildbotPageMeasurementResultsTest(
measurement_results = SummarySavingPageMeasurementResults()
measurement_results.WillMeasurePage(test_page_set.pages[0])
measurement_results.Add('a', 'seconds', 3)
measurement_results.Add('b', 'seconds', 10)
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.WillMeasurePage(test_page_set.pages[1])
measurement_results.Add('a', 'seconds', 3)
measurement_results.Add('b', 'seconds', 10)
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.WillMeasurePage(test_page_set.pages[2])
measurement_results.Add('a', 'seconds', 7)
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])
......@@ -115,12 +127,14 @@ class BuildbotPageMeasurementResultsTest(
measurement_results = SummarySavingPageMeasurementResults()
measurement_results.WillMeasurePage(test_page_set.pages[0])
measurement_results.Add('a', 'seconds', 3)
measurement_results.AddValue(scalar.ScalarValue(
test_page_set.pages[0], 'a', 'seconds', 3))
measurement_results.DidMeasurePage()
measurement_results.AddFailureMessage(test_page_set.pages[0], 'message')
measurement_results.WillMeasurePage(test_page_set.pages[1])
measurement_results.Add('a', 'seconds', 7)
measurement_results.AddValue(scalar.ScalarValue(
test_page_set.pages[1], 'a', 'seconds', 7))
measurement_results.DidMeasurePage()
measurement_results.AddSuccess(test_page_set.pages[1])
......@@ -139,21 +153,25 @@ class BuildbotPageMeasurementResultsTest(
measurement_results = SummarySavingPageMeasurementResults()
measurement_results.WillMeasurePage(test_page_set.pages[0])
measurement_results.Add('a', 'seconds', 3)
measurement_results.AddValue(scalar.ScalarValue(
test_page_set.pages[0], 'a', 'seconds', 3))
measurement_results.DidMeasurePage()
measurement_results.WillMeasurePage(test_page_set.pages[1])
measurement_results.Add('a', 'seconds', 7)
measurement_results.AddValue(scalar.ScalarValue(
test_page_set.pages[1], 'a', 'seconds', 7))
measurement_results.DidMeasurePage()
measurement_results.AddFailureMessage(test_page_set.pages[1], 'message')
measurement_results.WillMeasurePage(test_page_set.pages[0])
measurement_results.Add('a', 'seconds', 4)
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.WillMeasurePage(test_page_set.pages[1])
measurement_results.Add('a', 'seconds', 8)
measurement_results.AddValue(scalar.ScalarValue(
test_page_set.pages[1], 'a', 'seconds', 8))
measurement_results.DidMeasurePage()
measurement_results.AddSuccess(test_page_set.pages[1])
......@@ -176,22 +194,26 @@ class BuildbotPageMeasurementResultsTest(
measurement_results = SummarySavingPageMeasurementResults()
measurement_results.WillMeasurePage(test_page_set.pages[0])
measurement_results.Add('a', 'seconds', 3)
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.WillMeasurePage(test_page_set.pages[1])
measurement_results.Add('a', 'seconds', 7)
measurement_results.AddValue(scalar.ScalarValue(
test_page_set.pages[1], 'a', 'seconds', 7))
measurement_results.DidMeasurePage()
measurement_results.AddErrorMessage(test_page_set.pages[1], 'message')
measurement_results.WillMeasurePage(test_page_set.pages[0])
measurement_results.Add('a', 'seconds', 4)
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.WillMeasurePage(test_page_set.pages[1])
measurement_results.Add('a', 'seconds', 8)
measurement_results.AddValue(scalar.ScalarValue(
test_page_set.pages[1], 'a', 'seconds', 8))
measurement_results.DidMeasurePage()
measurement_results.AddSuccess(test_page_set.pages[1])
......@@ -213,22 +235,26 @@ class BuildbotPageMeasurementResultsTest(
measurement_results = SummarySavingPageMeasurementResults()
measurement_results.WillMeasurePage(test_page_set.pages[0])
measurement_results.Add('a', 'seconds', 3)
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.WillMeasurePage(test_page_set.pages[1])
measurement_results.Add('a', 'seconds', 7)
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.WillMeasurePage(test_page_set.pages[0])
measurement_results.Add('a', 'seconds', 4)
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.WillMeasurePage(test_page_set.pages[1])
measurement_results.Add('a', 'seconds', 8)
measurement_results.AddValue(scalar.ScalarValue(
test_page_set.pages[1], 'a', 'seconds', 8))
measurement_results.DidMeasurePage()
measurement_results.AddSuccess(test_page_set.pages[1])
......@@ -254,22 +280,26 @@ class BuildbotPageMeasurementResultsTest(
measurement_results = SummarySavingPageMeasurementResults()
measurement_results.WillMeasurePage(test_page_set.pages[0])
measurement_results.Add('a', 'seconds', 3)
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.WillMeasurePage(test_page_set.pages[0])
measurement_results.Add('a', 'seconds', 4)
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.WillMeasurePage(test_page_set.pages[1])
measurement_results.Add('a', 'seconds', 7)
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.WillMeasurePage(test_page_set.pages[1])
measurement_results.Add('a', 'seconds', 8)
measurement_results.AddValue(scalar.ScalarValue(
test_page_set.pages[1], 'a', 'seconds', 8))
measurement_results.DidMeasurePage()
measurement_results.AddSuccess(test_page_set.pages[1])
......@@ -299,12 +329,14 @@ class BuildbotPageMeasurementResultsTest(
scalar.ScalarValue(None, 'a', 'seconds', 1))
measurement_results.WillMeasurePage(test_page_set.pages[0])
measurement_results.Add('b', 'seconds', 2)
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.WillMeasurePage(test_page_set.pages[1])
measurement_results.Add('b', 'seconds', 3)
measurement_results.AddValue(scalar.ScalarValue(
test_page_set.pages[1], 'b', 'seconds', 3))
measurement_results.DidMeasurePage()
measurement_results.AddSuccess(test_page_set.pages[1])
......@@ -332,12 +364,14 @@ class BuildbotPageMeasurementResultsTest(
scalar.ScalarValue(None, 'a', 'seconds', 1))
measurement_results.WillMeasurePage(test_page_set.pages[0])
measurement_results.Add('b', 'seconds', 2)
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.WillMeasurePage(test_page_set.pages[0])
measurement_results.Add('b', 'seconds', 3)
measurement_results.AddValue(scalar.ScalarValue(
test_page_set.pages[0], 'b', 'seconds', 3))
measurement_results.DidMeasurePage()
measurement_results.AddSuccess(test_page_set.pages[0])
......@@ -362,12 +396,14 @@ class BuildbotPageMeasurementResultsTest(
scalar.ScalarValue(None, 'a', 'seconds', 1, important=False))
measurement_results.WillMeasurePage(test_page_set.pages[0])
measurement_results.Add('b', 'seconds', 2, data_type='unimportant')
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.WillMeasurePage(test_page_set.pages[1])
measurement_results.Add('b', 'seconds', 3, data_type='unimportant')
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])
......@@ -392,12 +428,14 @@ class BuildbotPageMeasurementResultsTest(
list_of_scalar_values.ListOfScalarValues(None, 'a', 'seconds', [1, 1]))
measurement_results.WillMeasurePage(test_page_set.pages[0])
measurement_results.Add('b', 'seconds', [2, 2])
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.WillMeasurePage(test_page_set.pages[1])
measurement_results.Add('b', 'seconds', [3, 3])
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])
......@@ -420,16 +458,18 @@ class BuildbotPageMeasurementResultsTest(
measurement_results = SummarySavingPageMeasurementResults()
measurement_results.WillMeasurePage(test_page_set.pages[0])
measurement_results.Add('a', 'units',
'{"buckets": [{"low": 1, "high": 2, "count": 1}]}',
data_type='unimportant-histogram')
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.WillMeasurePage(test_page_set.pages[1])
measurement_results.Add('a', 'units',
'{"buckets": [{"low": 2, "high": 3, "count": 1}]}',
data_type='unimportant-histogram')
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])
......
tools/telemetry/telemetry/results/csv_page_measurement_results_unittest.py
View file @ 0a3c84d8
......@@ -8,6 +8,8 @@ import unittest
from telemetry.results import csv_page_measurement_results
from telemetry.page import page_set
from telemetry.value import histogram
from telemetry.value import scalar
def _MakePageSet():
......@@ -47,7 +49,7 @@ class CsvPageMeasurementResultsTest(unittest.TestCase):
def test_with_output_after_every_page(self):
results = NonPrintingCsvPageMeasurementResults(self._output, True)
results.WillMeasurePage(self._page_set[0])
results.Add('foo', 'seconds', 3)
results.AddValue(scalar.ScalarValue(self._page_set[0], 'foo', 'seconds', 3))
results.DidMeasurePage()
self.assertEquals(
self.output_header_row,
......@@ -57,7 +59,7 @@ class CsvPageMeasurementResultsTest(unittest.TestCase):
[self._page_set[0].url, '3'])
results.WillMeasurePage(self._page_set[1])
results.Add('foo', 'seconds', 4)
results.AddValue(scalar.ScalarValue(self._page_set[1], 'foo', 'seconds', 4))
results.DidMeasurePage()
self.assertEquals(
len(self.output_data_rows),
......@@ -69,7 +71,7 @@ class CsvPageMeasurementResultsTest(unittest.TestCase):
def test_with_no_results_on_second_run(self):
results = NonPrintingCsvPageMeasurementResults(self._output, True)
results.WillMeasurePage(self._page_set[0])
results.Add('foo', 'seconds', 3)
results.AddValue(scalar.ScalarValue(self._page_set[0], 'foo', 'seconds', 3))
results.DidMeasurePage()
results.WillMeasurePage(self._page_set[1])
......@@ -78,23 +80,23 @@ class CsvPageMeasurementResultsTest(unittest.TestCase):
def test_fewer_results_on_second_run(self):
results = NonPrintingCsvPageMeasurementResults(self._output, True)
results.WillMeasurePage(self._page_set[0])
results.Add('foo', 'seconds', 3)
results.Add('bar', 'seconds', 4)
results.AddValue(scalar.ScalarValue(self._page_set[0], 'foo', 'seconds', 3))
results.AddValue(scalar.ScalarValue(self._page_set[0], 'bar', 'seconds', 4))
results.DidMeasurePage()
results.WillMeasurePage(self._page_set[1])
results.Add('bar', 'seconds', 5)
results.AddValue(scalar.ScalarValue(self._page_set[1], 'bar', 'seconds', 5))
results.DidMeasurePage()
def test_more_results_on_second_run(self):
results = NonPrintingCsvPageMeasurementResults(self._output, True)
results.WillMeasurePage(self._page_set[0])
results.Add('foo', 'seconds', 3)
results.AddValue(scalar.ScalarValue(self._page_set[0], 'foo', 'seconds', 3))
results.DidMeasurePage()
results.WillMeasurePage(self._page_set[1])
results.Add('foo', 'seconds', 4)
results.Add('bar', 'seconds', 5)
results.AddValue(scalar.ScalarValue(self._page_set[1], 'foo', 'seconds', 4))
results.AddValue(scalar.ScalarValue(self._page_set[1], 'bar', 'seconds', 5))
self.assertRaises(
Exception,
......@@ -103,12 +105,12 @@ class CsvPageMeasurementResultsTest(unittest.TestCase):
def test_with_output_after_every_page_and_inconsistency(self):
results = NonPrintingCsvPageMeasurementResults(self._output, True)
results.WillMeasurePage(self._page_set[0])
results.Add('foo', 'seconds', 3)
results.AddValue(scalar.ScalarValue(self._page_set[0], 'foo', 'seconds', 3))
results.DidMeasurePage()
# We printed foo, now change to bar
results.WillMeasurePage(self._page_set[1])
results.Add('bar', 'seconds', 4)
results.AddValue(scalar.ScalarValue(self._page_set[1], 'bar', 'seconds', 4))
self.assertRaises(
Exception,
......@@ -117,11 +119,11 @@ class CsvPageMeasurementResultsTest(unittest.TestCase):
def test_with_output_at_print_summary_time(self):
results = NonPrintingCsvPageMeasurementResults(self._output, False)
results.WillMeasurePage(self._page_set[0])
results.Add('foo', 'seconds', 3)
results.AddValue(scalar.ScalarValue(self._page_set[0], 'foo', 'seconds', 3))
results.DidMeasurePage()
results.WillMeasurePage(self._page_set[1])
results.Add('bar', 'seconds', 4)
results.AddValue(scalar.ScalarValue(self._page_set[1], 'bar', 'seconds', 4))
results.DidMeasurePage()
results.PrintSummary()
......@@ -137,15 +139,15 @@ class CsvPageMeasurementResultsTest(unittest.TestCase):
def test_histogram(self):
results = NonPrintingCsvPageMeasurementResults(self._output, False)
results.WillMeasurePage(self._page_set[0])
results.Add('a', '',
'{"buckets": [{"low": 1, "high": 2, "count": 1}]}',
data_type='histogram')
results.AddValue(histogram.HistogramValue(
self._page_set[0], 'a', '',
raw_value_json='{"buckets": [{"low": 1, "high": 2, "count": 1}]}'))
results.DidMeasurePage()
results.WillMeasurePage(self._page_set[1])
results.Add('a', '',
'{"buckets": [{"low": 2, "high": 3, "count": 1}]}',
data_type='histogram')
results.AddValue(histogram.HistogramValue(
self._page_set[1], 'a', '',
raw_value_json='{"buckets": [{"low": 2, "high": 3, "count": 1}]}'))
results.DidMeasurePage()
results.PrintSummary()
......
tools/telemetry/telemetry/results/html_page_measurement_results_unittest.py
View file @ 0a3c84d8
......@@ -7,6 +7,7 @@ import unittest
from telemetry.page import page_set
from telemetry.results import html_page_measurement_results
from telemetry.value import scalar
def _MakePageSet():
......@@ -41,12 +42,14 @@ class HtmlPageMeasurementResultsTest(unittest.TestCase):
results = DeterministicHtmlPageMeasurementResults(
output_file, 'test_name', False, False, 'browser_type')
results.WillMeasurePage(test_page_set.pages[0])
results.Add('a', 'seconds', 3)
results.AddValue(scalar.ScalarValue(
test_page_set.pages[0], '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.AddValue(scalar.ScalarValue(
test_page_set.pages[1], 'a', 'seconds', 7))
results.DidMeasurePage()
results.AddSuccess(test_page_set.pages[1])
......@@ -96,12 +99,14 @@ class HtmlPageMeasurementResultsTest(unittest.TestCase):
results = DeterministicHtmlPageMeasurementResults(
output_file, 'test_name', False, False, 'browser_type')
results.WillMeasurePage(test_page_set.pages[0])
results.Add('a', 'seconds', 4)
results.AddValue(scalar.ScalarValue(
test_page_set.pages[0], '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.AddValue(scalar.ScalarValue(
test_page_set.pages[1], 'a', 'seconds', 8))
results.DidMeasurePage()
results.AddSuccess(test_page_set.pages[1])
......@@ -189,12 +194,14 @@ class HtmlPageMeasurementResultsTest(unittest.TestCase):
results = DeterministicHtmlPageMeasurementResults(
output_file, 'test_name', True, False, 'browser_type')
results.WillMeasurePage(test_page_set.pages[0])
results.Add('a', 'seconds', 5)
results.AddValue(scalar.ScalarValue(
test_page_set.pages[0], '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.AddValue(scalar.ScalarValue(
test_page_set.pages[1], 'a', 'seconds', 9))
results.DidMeasurePage()
results.AddSuccess(test_page_set.pages[1])
......
tools/telemetry/telemetry/results/page_measurement_results_unittest.py
View file @ 0a3c84d8
......@@ -7,8 +7,10 @@ import unittest
from telemetry import perf_tests_helper
from telemetry.page import page_set
from telemetry.results import page_measurement_results
from telemetry.value import histogram
from telemetry.value import scalar
def _MakePageSet():
ps = page_set.PageSet(file_path=os.path.dirname(__file__))
ps.AddPageWithDefaultRunNavigate("http://www.bar.com/")
......@@ -45,11 +47,11 @@ class PageMeasurementResultsTest(unittest.TestCase):
def test_basic(self):
results = NonPrintingPageMeasurementResults()
results.WillMeasurePage(self.pages[0])
results.Add('a', 'seconds', 3)
results.AddValue(scalar.ScalarValue(self.pages[0], 'a', 'seconds', 3))
results.DidMeasurePage()
results.WillMeasurePage(self.pages[1])
results.Add('a', 'seconds', 3)
results.AddValue(scalar.ScalarValue(self.pages[1], 'a', 'seconds', 3))
results.DidMeasurePage()
results.PrintSummary()
......@@ -68,13 +70,14 @@ class PageMeasurementResultsTest(unittest.TestCase):
results.WillMeasurePage(self.pages[0])
self.assertRaises(
AssertionError,
lambda: results.Add('url', 'string', 'foo'))
lambda: results.AddValue(scalar.ScalarValue(
self.pages[0], 'url', 'string', 'foo')))
def test_value_names_that_have_been_seen(self):
results = NonPrintingPageMeasurementResults()
results.WillMeasurePage(self.pages[0])
results.Add('a', 'a_units', 3)
results.Add('b', 'b_units', 3)
results.AddValue(scalar.ScalarValue(self.pages[0], 'a', 'a_units', 3))
results.AddValue(scalar.ScalarValue(self.pages[0], 'b', 'b_units', 3))
results.AddSummaryValue(scalar.ScalarValue(None, 'c', 'c_units', 3))
results.DidMeasurePage()
self.assertEquals(set(['a', 'b', 'c']),
......@@ -94,37 +97,40 @@ class PageMeasurementResultsTest(unittest.TestCase):
def test_unit_change(self):
results = NonPrintingPageMeasurementResults()
results.WillMeasurePage(self.pages[0])
results.Add('a', 'seconds', 3)
results.AddValue(scalar.ScalarValue(self.pages[0], 'a', 'seconds', 3))
results.DidMeasurePage()
results.WillMeasurePage(self.pages[1])
self.assertRaises(
AssertionError,
lambda: results.Add('a', 'foobgrobbers', 3))
lambda: results.AddValue(scalar.ScalarValue(
self.pages[1], 'a', 'foobgrobbers', 3)))
self.assertEquals(['a'], results.all_value_names_that_have_been_seen)
def test_type_change(self):
results = NonPrintingPageMeasurementResults()
results.WillMeasurePage(self.pages[0])
results.Add('a', 'seconds', 3)
results.AddValue(scalar.ScalarValue(self.pages[0], 'a', 'seconds', 3))
results.DidMeasurePage()
results.WillMeasurePage(self.pages[1])
self.assertRaises(
AssertionError,
lambda: results.Add('a', 'seconds', 3, data_type='histogram'))
lambda: results.AddValue(histogram.HistogramValue(
self.pages[1], 'a', 'seconds',
raw_value_json='{"buckets": [{"low": 1, "high": 2, "count": 1}]}')))
def test_basic_summary_all_pages_fail(self):
"""If all pages fail, no summary is printed."""
results = SummarySavingPageMeasurementResults()
results.WillMeasurePage(self.pages[0])
results.Add('a', 'seconds', 3)
results.AddValue(scalar.ScalarValue(self.pages[0], 'a', 'seconds', 3))
results.DidMeasurePage()
results.AddFailureMessage(self.pages[0], 'message')
results.WillMeasurePage(self.pages[1])
results.Add('a', 'seconds', 7)
results.AddValue(scalar.ScalarValue(self.pages[1], 'a', 'seconds', 7))
results.DidMeasurePage()
results.AddFailureMessage(self.pages[1], 'message')
......@@ -134,7 +140,7 @@ class PageMeasurementResultsTest(unittest.TestCase):
def test_get_successful_page_values_merged_no_failures(self):
results = SummarySavingPageMeasurementResults()
results.WillMeasurePage(self.pages[0])
results.Add('a', 'seconds', 3)
results.AddValue(scalar.ScalarValue(self.pages[0], 'a', 'seconds', 3))
self.assertEquals(1, len(results.page_specific_values_for_current_page))
results.DidMeasurePage()
self.assertRaises(
......@@ -144,15 +150,15 @@ class PageMeasurementResultsTest(unittest.TestCase):
def test_get_all_values_for_successful_pages(self):
results = SummarySavingPageMeasurementResults()
results.WillMeasurePage(self.pages[0])
results.Add('a', 'seconds', 3)
results.AddValue(scalar.ScalarValue(self.pages[0], 'a', 'seconds', 3))
results.DidMeasurePage()
results.WillMeasurePage(self.pages[1])
results.Add('a', 'seconds', 3)
results.AddValue(scalar.ScalarValue(self.pages[1], 'a', 'seconds', 3))
results.DidMeasurePage()
results.WillMeasurePage(self.pages[2])
results.Add('a', 'seconds', 3)
results.AddValue(scalar.ScalarValue(self.pages[2], 'a', 'seconds', 3))
results.DidMeasurePage()
values = results.all_page_specific_values
......@@ -163,7 +169,7 @@ class PageMeasurementResultsTest(unittest.TestCase):
def test_get_all_values_for_successful_pages_one_page_fails(self):
results = SummarySavingPageMeasurementResults()
results.WillMeasurePage(self.pages[0])
results.Add('a', 'seconds', 3)
results.AddValue(scalar.ScalarValue(self.pages[0], 'a', 'seconds', 3))
results.DidMeasurePage()
results.WillMeasurePage(self.pages[1])
......@@ -171,7 +177,7 @@ class PageMeasurementResultsTest(unittest.TestCase):
results.DidMeasurePage()
results.WillMeasurePage(self.pages[2])
results.Add('a', 'seconds', 3)
results.AddValue(scalar.ScalarValue(self.pages[2], 'a', 'seconds', 3))
results.DidMeasurePage()
values = results.all_page_specific_values
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment