Chromium Code Reviews| Index: tools/telemetry/telemetry/value/trace_unittest.py |
| diff --git a/tools/telemetry/telemetry/value/trace_unittest.py b/tools/telemetry/telemetry/value/trace_unittest.py |
| index 6c9bda41584725dcd1301c29489ba97f22a43be2..754f5d70c512b4e24a8de7d23aaaeaa4ddf4f3f4 100644 |
| --- a/tools/telemetry/telemetry/value/trace_unittest.py |
| +++ b/tools/telemetry/telemetry/value/trace_unittest.py |
| @@ -7,6 +7,7 @@ import unittest |
| from telemetry.page import page_set |
| from telemetry.timeline import tracing_timeline_data |
| +from telemetry.unittest_util import system_stub |
| from telemetry.value import trace |
| class TestBase(unittest.TestCase): |
| @@ -16,16 +17,30 @@ class TestBase(unittest.TestCase): |
| self.page_set.AddPageWithDefaultRunNavigate("http://www.baz.com/") |
| self.page_set.AddPageWithDefaultRunNavigate("http://www.foo.com/") |
| + self._cloud_storage_stub = None |
| + |
| + def tearDown(self): |
| + if self._cloud_storage_stub: |
| + self._cloud_storage_stub.Restore() |
| + self._cloud_storage_stub = None |
| + |
| + def StubCloudStorage(self): |
|
nednguyen
2014/11/20 18:46:53
just make this setUp(self):
Yufeng Shen (Slow to review)
2014/11/20 19:13:35
Done.
|
| + self._cloud_storage_stub = system_stub.Override(trace, ['cloud_storage']) |
| + |
| @property |
| def pages(self): |
| return self.page_set.pages |
| class ValueTest(TestBase): |
| def testAsDict(self): |
| + self.StubCloudStorage() |
| v = trace.TraceValue( |
| None, tracing_timeline_data.TracingTimelineData({'test' : 1})) |
| - fh_id = v.GetAssociatedFileHandle().id |
| - |
| + fh = v.GetAssociatedFileHandle() |
| + trace.cloud_storage.SetCalculatedHashesForTesting( |
| + {fh.GetAbsPath(): None, }) |
|
nednguyen
2014/11/20 18:46:53
Can you use some random value rather than None?
Yufeng Shen (Slow to review)
2014/11/20 19:13:35
Done.
|
| + bucket = trace.cloud_storage.PUBLIC_BUCKET |
| + cloud_url = v.UploadToCloud(bucket) |
| d = v.AsDict() |
| - |
| - self.assertEqual(d['file_id'], fh_id) |
| + self.assertEqual(d['file_id'], fh.id) |
| + self.assertEqual(d['cloud_url'], cloud_url) |