diff options
| author | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-17 11:09:33 +0000 |
|---|---|---|
| committer | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-17 11:09:33 +0000 |
| commit | bf19b116f2d093f781eec2db3eef71b1bbc039c8 (patch) | |
| tree | 6a2592ffeb4f0c9cf42fa18691443c171570e082 /tools | |
| parent | b4f0bf3e8f14a33340c616848274bd94b8df8e1b (diff) | |
| download | chromium_src-bf19b116f2d093f781eec2db3eef71b1bbc039c8.zip chromium_src-bf19b116f2d093f781eec2db3eef71b1bbc039c8.tar.gz chromium_src-bf19b116f2d093f781eec2db3eef71b1bbc039c8.tar.bz2 | |
Telemetry: fixes InspectorTimeline.testGotTimeline
This test was flaky due to image caching.
Simplify it and just ensure rAF is triggered and accounted in the timeline.
BUG=170271
TEST=tools/telemetry/run_tests --browser=system testGotTimeline
NOTRY=True
Review URL: https://chromiumcodereview.appspot.com/11968014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177387 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/telemetry/telemetry/inspector_timeline_unittest.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/tools/telemetry/telemetry/inspector_timeline_unittest.py b/tools/telemetry/telemetry/inspector_timeline_unittest.py index d80e94d..8b47987 100644 --- a/tools/telemetry/telemetry/inspector_timeline_unittest.py +++ b/tools/telemetry/telemetry/inspector_timeline_unittest.py @@ -112,20 +112,14 @@ class InspectorTimelineTabTest(tab_test_case.TabTestCase): util.WaitFor(_IsDone, 5) def testGotTimeline(self): - self._StartServer() - image_url = self._browser.http_server.UrlOf('image.png') with InspectorTimeline.Recorder(self._tab): self._tab.runtime.Execute( """ var done = false; -var i = document.createElement('img'); -i.src = '%s'; -document.body.appendChild(i); window.webkitRequestAnimationFrame(function() { done = true; }); -""" % image_url) +""") self._WaitForAnimationFrame() - r = self._tab.timeline_model.GetAllOfName('DecodeImage') + r = self._tab.timeline_model.GetAllOfName('FireAnimationFrame') self.assertTrue(len(r) > 0) - self.assertEquals(r[0].args['data']['imageType'], 'PNG') self.assertTrue(r[0].duration_ms > 0) |