Index: tools/telemetry/telemetry/core/bitmap_unittest.py |
diff --git a/tools/telemetry/telemetry/core/bitmap_unittest.py b/tools/telemetry/telemetry/core/bitmap_unittest.py |
index 1045614cdf6f5f257a5ce0c60a93cd88f58d7130..8613b141729b29fb53cd4be257e2b49ed40e8795 100644 |
--- a/tools/telemetry/telemetry/core/bitmap_unittest.py |
+++ b/tools/telemetry/telemetry/core/bitmap_unittest.py |
@@ -6,7 +6,7 @@ import tempfile |
import os |
import unittest |
-from telemetry import test |
+from telemetry import benchmark |
from telemetry.core import bitmap |
from telemetry.core import util |
@@ -97,7 +97,7 @@ class BitmapTest(unittest.TestCase): |
new_file = bitmap.Bitmap.FromPngFile(temp_file) |
self.assertTrue(orig.IsEqual(new_file)) |
- @test.Disabled |
+ @benchmark.Disabled |
def testWriteCroppedBmpToPngFile(self): |
pixels = [255,0,0, 255,255,0, 0,0,0, |
255,255,0, 0,255,0, 0,0,0] |
@@ -143,7 +143,7 @@ class BitmapTest(unittest.TestCase): |
diff_bmp.GetPixelColor(2, 1).AssertIsRGB(255, 255, 255) |
diff_bmp.GetPixelColor(2, 2).AssertIsRGB(255, 255, 255) |
- @test.Disabled |
+ @benchmark.Disabled |
def testGetBoundingBox(self): |
pixels = [0,0,0, 0,0,0, 0,0,0, 0,0,0, |
0,0,0, 1,0,0, 1,0,0, 0,0,0, |
@@ -157,7 +157,7 @@ class BitmapTest(unittest.TestCase): |
self.assertEquals(box, None) |
self.assertEquals(count, 0) |
- @test.Disabled |
+ @benchmark.Disabled |
def testCrop(self): |
pixels = [0,0,0, 1,0,0, 2,0,0, 3,0,0, |
0,1,0, 1,1,0, 2,1,0, 3,1,0, |
@@ -171,7 +171,7 @@ class BitmapTest(unittest.TestCase): |
bmp.GetPixelColor(1, 0).AssertIsRGB(2, 2, 0) |
self.assertEquals(bmp.pixels, bytearray([1,2,0, 2,2,0])) |
- @test.Disabled |
+ @benchmark.Disabled |
def testHistogram(self): |
pixels = [1,2,3, 1,2,3, 1,2,3, 1,2,3, |
1,2,3, 8,7,6, 5,4,6, 1,2,3, |
@@ -191,7 +191,7 @@ class BitmapTest(unittest.TestCase): |
self.assertEquals(histogram.b[3], 0) |
self.assertEquals(histogram.b[6], 4) |
- @test.Disabled |
+ @benchmark.Disabled |
def testHistogramIgnoreColor(self): |
pixels = [1,2,3, 1,2,3, 1,2,3, 1,2,3, |
1,2,3, 8,7,6, 5,4,6, 1,2,3, |
@@ -208,7 +208,7 @@ class BitmapTest(unittest.TestCase): |
self.assertEquals(histogram.b[3], 0) |
self.assertEquals(histogram.b[6], 4) |
- @test.Disabled |
+ @benchmark.Disabled |
def testHistogramIgnoreColorTolerance(self): |
pixels = [1,2,3, 4,5,6, |
7,8,9, 8,7,6] |
@@ -228,7 +228,7 @@ class BitmapTest(unittest.TestCase): |
self.assertEquals(histogram.b[6], 2) |
self.assertEquals(histogram.b[9], 1) |
- @test.Disabled |
+ @benchmark.Disabled |
def testHistogramDistanceIgnoreColor(self): |
pixels = [1,2,3, 1,2,3, |
1,2,3, 1,2,3] |