| Index: tools/telemetry/telemetry/core/video_unittest.py
|
| diff --git a/tools/telemetry/telemetry/core/video_unittest.py b/tools/telemetry/telemetry/core/video_unittest.py
|
| index aa4ddbe0c51d036aa0443debe21c3933a4601b48..9bbdafbafbb825690e618b33ddecb71934fbaca7 100644
|
| --- a/tools/telemetry/telemetry/core/video_unittest.py
|
| +++ b/tools/telemetry/telemetry/core/video_unittest.py
|
| @@ -6,7 +6,6 @@ import logging
|
| import os
|
| import unittest
|
|
|
| -from telemetry import benchmark
|
| from telemetry.core import bitmap
|
| from telemetry.core import platform
|
| from telemetry.core import util
|
| @@ -15,7 +14,6 @@ from telemetry.core import video
|
|
|
| class VideoTest(unittest.TestCase) :
|
|
|
| - @benchmark.Disabled
|
| def testFramesFromMp4(self):
|
| host_platform = platform.GetHostPlatform()
|
|
|
| @@ -45,6 +43,6 @@ class VideoTest(unittest.TestCase) :
|
| for i, timestamp_bitmap in enumerate(video_obj._FramesFromMp4(vid)):
|
| timestamp, bmp = timestamp_bitmap
|
| self.assertEquals(timestamp, expected_timestamps[i])
|
| - expected_bitmap = bitmap.Bitmap.FromPngFile(os.path.join(
|
| + expected_bitmap = bitmap.Bitmap.FromImageFile(os.path.join(
|
| util.GetUnittestDataDir(), 'frame%d.png' % i))
|
| self.assertTrue(expected_bitmap.IsEqual(bmp))
|
|
|