summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRandall Spangler <rspangler@chromium.org>2011-08-23 13:21:25 -0700
committerRandall Spangler <rspangler@chromium.org>2011-08-23 13:58:00 -0700
commita2da72b4b07cd98e2724013a99eda538f233ebc5 (patch)
tree55f8eb78459a2ae89a7607e7a7b19c2de7991105
parent2e0226309d1407e0968a6b699e99126c98407319 (diff)
downloadvboot-a2da72b4b07cd98e2724013a99eda538f233ebc5.tar.gz
Disable broken bmpblock_utility test
The current bmpblock_utility doesn't preserve the order of images as specified in the config yaml file. This doesn't affect the functioning of the firmware, but does break this overly-restrictive test. Filed crosbug.com/19541 to fix this after Bill's current refactoring. BUG=chromium-os:19541 TEST=make && make runtests Change-Id: I03fe817bd191fec5f65aad37561a3224b6a2b1e6 Reviewed-on: http://gerrit.chromium.org/gerrit/6512 Reviewed-by: Bill Richardson <wfrichar@chromium.org> Tested-by: Randall Spangler <rspangler@chromium.org>
-rwxr-xr-xtests/bitmaps/TestBmpBlock.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/bitmaps/TestBmpBlock.py b/tests/bitmaps/TestBmpBlock.py
index ca7ef4a0..8f47fe42 100755
--- a/tests/bitmaps/TestBmpBlock.py
+++ b/tests/bitmaps/TestBmpBlock.py
@@ -154,8 +154,12 @@ class TestReproducable(unittest.TestCase):
rc, out, err = runprog('/bin/rm', '-f', 'ORDER1', 'ORDER2')
self.assertEqual(0, rc)
- def testReproduce(self):
+ def disabledTestReproduce(self):
"""Equivalent yaml files should produce identical bmpblocks"""
+ # TODO: This test is currently broken because bmpblock_utility
+ # uses a map to hold the images, and the map doesn't preserve image
+ # order. So a simple compare is insufficient to determine that
+ # the bmpblocks are equivalent. See crosbug.com/19541.
rc, out, err = runprog(prog, '-c', 'case_order1.yaml', 'ORDER1')
self.assertEqual(0, rc)
rc, out, err = runprog(prog, '-c', 'case_order2.yaml', 'ORDER2')
@@ -201,4 +205,3 @@ if __name__ == '__main__':
prog = os.environ[varname]
print "Testing prog...", prog
unittest.main()
-