summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-13 23:48:34 +0000
committertonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-13 23:48:34 +0000
commit42bfdc0281886de27eb6d2b8b691edf9e7199e4e (patch)
treea0a8403ad9eb31e368e07a836418a250ff48772f
parent693b3a7431c89a076b1ad95b3b65beb120d44df8 (diff)
downloadchromium_src-42bfdc0281886de27eb6d2b8b691edf9e7199e4e.zip
chromium_src-42bfdc0281886de27eb6d2b8b691edf9e7199e4e.tar.gz
chromium_src-42bfdc0281886de27eb6d2b8b691edf9e7199e4e.tar.bz2
[Telemetry] Enable BitmapUnittests now that the binary is checked in.
BUG= Review URL: https://codereview.chromium.org/272023004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270250 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--tools/telemetry/telemetry/core/bitmap_unittest.py8
1 files changed, 0 insertions, 8 deletions
diff --git a/tools/telemetry/telemetry/core/bitmap_unittest.py b/tools/telemetry/telemetry/core/bitmap_unittest.py
index 1045614..d5615e4 100644
--- a/tools/telemetry/telemetry/core/bitmap_unittest.py
+++ b/tools/telemetry/telemetry/core/bitmap_unittest.py
@@ -6,7 +6,6 @@ import tempfile
import os
import unittest
-from telemetry import test
from telemetry.core import bitmap
from telemetry.core import util
@@ -97,7 +96,6 @@ class BitmapTest(unittest.TestCase):
new_file = bitmap.Bitmap.FromPngFile(temp_file)
self.assertTrue(orig.IsEqual(new_file))
- @test.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 +141,6 @@ class BitmapTest(unittest.TestCase):
diff_bmp.GetPixelColor(2, 1).AssertIsRGB(255, 255, 255)
diff_bmp.GetPixelColor(2, 2).AssertIsRGB(255, 255, 255)
- @test.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 +154,6 @@ class BitmapTest(unittest.TestCase):
self.assertEquals(box, None)
self.assertEquals(count, 0)
- @test.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 +167,6 @@ 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
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 +186,6 @@ class BitmapTest(unittest.TestCase):
self.assertEquals(histogram.b[3], 0)
self.assertEquals(histogram.b[6], 4)
- @test.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 +202,6 @@ class BitmapTest(unittest.TestCase):
self.assertEquals(histogram.b[3], 0)
self.assertEquals(histogram.b[6], 4)
- @test.Disabled
def testHistogramIgnoreColorTolerance(self):
pixels = [1,2,3, 4,5,6,
7,8,9, 8,7,6]
@@ -228,7 +221,6 @@ class BitmapTest(unittest.TestCase):
self.assertEquals(histogram.b[6], 2)
self.assertEquals(histogram.b[9], 1)
- @test.Disabled
def testHistogramDistanceIgnoreColor(self):
pixels = [1,2,3, 1,2,3,
1,2,3, 1,2,3]