Index: tools/telemetry/telemetry/results/page_test_results_unittest.py |
diff --git a/tools/telemetry/telemetry/results/page_test_results_unittest.py b/tools/telemetry/telemetry/results/page_test_results_unittest.py |
index 536cdc84b0581aa684f538a284c6429decf2ce18..08f79df71552d7f48c3022110a0bb743e069c739 100644 |
--- a/tools/telemetry/telemetry/results/page_test_results_unittest.py |
+++ b/tools/telemetry/telemetry/results/page_test_results_unittest.py |
@@ -15,6 +15,9 @@ from telemetry.value import scalar |
from telemetry.value import skip |
from telemetry.value import trace |
+class TraceValueForTest(trace.TraceValue): |
+ def CleanUp(self): |
+ raise NotImplementedError() |
class PageTestResultsTest(base_test_results_unittest.BaseTestResultsUnittest): |
def setUp(self): |
@@ -28,7 +31,7 @@ class PageTestResultsTest(base_test_results_unittest.BaseTestResultsUnittest): |
def pages(self): |
return self.page_set.pages |
- def testFailures(self): |
+ def test_failures(self): |
results = page_test_results.PageTestResults() |
results.WillRunPage(self.pages[0]) |
results.AddValue( |
@@ -45,7 +48,7 @@ class PageTestResultsTest(base_test_results_unittest.BaseTestResultsUnittest): |
self.assertTrue(results.all_page_runs[0].failed) |
self.assertTrue(results.all_page_runs[1].ok) |
- def testSkips(self): |
+ def test_skips(self): |
results = page_test_results.PageTestResults() |
results.WillRunPage(self.pages[0]) |
results.AddValue(skip.SkipValue(self.pages[0], 'testing reason')) |
@@ -187,7 +190,7 @@ class PageTestResultsTest(base_test_results_unittest.BaseTestResultsUnittest): |
self.assertEquals( |
[value1, value2, value3], results.all_page_specific_values) |
- def testTraceValue(self): |
+ def test_trace_value(self): |
nednguyen
2015/02/18 18:35:59
Hmh, I will make a patch to clean up all of this u
eakuefner
2015/02/18 20:41:03
OK, I saw your CL, so I'll just make the names of
|
results = page_test_results.PageTestResults() |
results.WillRunPage(self.pages[0]) |
results.AddValue(trace.TraceValue(None, trace_data.TraceData({'test' : 1}))) |
@@ -201,3 +204,29 @@ class PageTestResultsTest(base_test_results_unittest.BaseTestResultsUnittest): |
values = results.FindAllTraceValues() |
self.assertEquals(2, len(values)) |
+ |
+ def test_clean_up_cleans_up_trace_values(self): |
nednguyen
2015/02/18 18:35:59
testCleanUpCleansUpAllTraceValues
eakuefner
2015/02/18 20:41:03
Done.
|
+ results = page_test_results.PageTestResults() |
+ |
+ results.WillRunPage(self.pages[0]) |
+ results.AddValue(TraceValueForTest(None, trace_data.TraceData({'test': 1}))) |
+ results.DidRunPage(self.pages[0]) |
+ |
+ with self.assertRaises(NotImplementedError): |
+ results.CleanUp() |
nednguyen
2015/02/18 18:35:59
Err, this is awkward wait to test the cleanup has
eakuefner
2015/02/18 20:41:03
I added cleaned_up to the actual TraceValue and go
|
+ |
+ def test_no_traces_left_after_clean_up(self): |
nednguyen
2015/02/18 18:35:59
testNoTracesLeftAfterCleanUp
eakuefner
2015/02/18 20:41:03
Done.
|
+ results = page_test_results.PageTestResults() |
+ v0 = trace.TraceValue(None, trace_data.TraceData({'test': 1})) |
+ v1 = trace.TraceValue(None, trace_data.TraceData({'test': 2})) |
+ |
+ results.WillRunPage(self.pages[0]) |
+ results.AddValue(v0) |
+ results.DidRunPage(self.pages[0]) |
+ |
+ results.WillRunPage(self.pages[1]) |
+ results.AddValue(v1) |
+ results.DidRunPage(self.pages[1]) |
+ |
+ results.CleanUp() |
+ self.assertFalse(results.FindAllTraceValues()) |