New commandline args are clearer, and prepare for compression.

BUG=chromium-os:11488
TEST=none

Change-Id: I6ee493037da5746d2db6e840ac6590dd12f37cfe

Review URL: http://codereview.chromium.org/6482001

1 files changed, 8 insertions, 3 deletions

diff --git a/tests/bitmaps/TestBmpBlock.py b/tests/bitmaps/TestBmpBlock.py
index 9abe72df..77ef4199 100755
--- a/tests/bitmaps/TestBmpBlock.py
+++ b/tests/bitmaps/TestBmpBlock.py
@@ -1,4 +1,8 @@
 #!/usr/bin/python -tt
+#
+# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
 
 """Unit tests for bmpblk_utility.
 """
@@ -21,17 +25,18 @@ class TestBmpBlock(unittest.TestCase):
     """Running with no args should print usage and fail."""
     rc, out, err = runprog(prog)
     self.assertNotEqual(0, rc)
-    self.assertTrue(out.count("Usage:"))
+    self.assertTrue(err.count("missing BMPBLOCK name"))
+    self.assertTrue(out.count("bmpblk_utility"))
 
   def testMissingBmp(self):
     """Missing a bmp specified in the yaml is an error."""
-    rc, out, err = runprog(prog, '-c', '-C', 'case_nobmp.yaml', 'FOO')
+    rc, out, err = runprog(prog, '-c', 'case_nobmp.yaml', 'FOO')
     self.assertNotEqual(0, rc)
     self.assertTrue(err.count("No such file or directory"))
 
   def testInvalidBmp(self):
     """A .bmp file that isn't really a BMP should fail."""
-    rc, out, err = runprog(prog, '-c', '-C', 'case_badbmp.yaml', 'FOO')
+    rc, out, err = runprog(prog, '-c', 'case_badbmp.yaml', 'FOO')
     self.assertNotEqual(0, rc)
     self.assertTrue(err.count("Unsupported image format"))