Allow yaml file to specify default compression for images

tests/bitmaps/TestBmpBlock.py

 #!/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.
 """
 
 import os
@@ skipping 55 matching lines @@
     self.assertEqual(0, rc)
 
   def tearDown(self):
     rc, out, err = runprog('/bin/rm', '-rf', './FOO_DIR', 'FOO')
     self.assertEqual(0, rc)
 
 
 class TestPackUnpack(unittest.TestCase):
 
   def setUp(self):
+    self._cwd = os.getcwd()
     rc, out, err = runprog('/bin/rm', '-rf', './FOO_DIR', 'FOO')
     self.assertEqual(0, rc)
 
   def testPackUnpack(self):
     """Create, unpack, recreate without compression"""
     rc, out, err = runprog(prog, '-c', 'case_simple.yaml', 'FOO')
     self.assertEqual(0, rc)
     rc, out, err = runprog(prog, '-x', '-d', './FOO_DIR', 'FOO')
     self.assertEqual(0, rc)
     os.chdir('./FOO_DIR')
@@ skipping 17 matching lines @@
     os.chdir('..')
 
   def testPackUnpackZ1(self):
     """Create, unpack, recreate with EFIv1 compression"""
     self.doPackUnpackZ('1');
 
   def testPackUnpackZ2(self):
     """Create, unpack, recreate with LZMA compression"""
     self.doPackUnpackZ('2');
 
+  def doPackUnpackImplicitZ(self, comp, noncomp):
+    """Create with given compression, unpack, repack without specifying"""
+    # create with the specified compression scheme
+    rc, out, err = runprog(prog, '-z', comp, '-c', 'case_simple.yaml', 'FOO')
+    self.assertEqual(0, rc)
+    # unpack. yaml file should have compression scheme in it
+    rc, out, err = runprog(prog, '-f', '-x', '-d', './FOO_DIR', 'FOO')
+    self.assertEqual(0, rc)
+    os.chdir('./FOO_DIR')
+    # create with no compression specified, should use default from yaml
+    rc, out, err = runprog(prog, '-c', 'config.yaml', 'BAR')
+    self.assertEqual(0, rc)
+    # so new output should match original
+    rc, out, err = runprog('/usr/bin/cmp', '../FOO', 'BAR')
+    self.assertEqual(0, rc)
+    # Now make sure that specifying a compression arg will override the default
+    for mycomp in noncomp:
+      # create with compression scheme different from default
+      rc, out, err = runprog(prog, '-z', str(mycomp), '-c', 'config.yaml', 'BAR')
+      self.assertEqual(0, rc)
+      # should be different binary
+      rc, out, err = runprog('/usr/bin/cmp', '../FOO', 'BAR')
+      self.assertNotEqual(0, rc)
+    os.chdir('..')
+
+  def testPackUnpackImplicitZ(self):
+    """Create, unpack, recreate with implicit compression"""
+    self._allowed = range(3)
+    for c in self._allowed:
+      self.doPackUnpackImplicitZ(str(c), [x for x in self._allowed if x != c])
+
   def tearDown(self):
+    os.chdir(self._cwd)
     rc, out, err = runprog('/bin/rm', '-rf', './FOO_DIR', 'FOO')
     self.assertEqual(0, rc)
 
 
 class TestReproducable(unittest.TestCase):
 
   def setUp(self):
     rc, out, err = runprog('/bin/rm', '-f', 'ORDER1', 'ORDER2')
     self.assertEqual(0, rc)
 
@@ skipping 38 matching lines @@
 if __name__ == '__main__':
   varname = 'BMPBLK'
   if varname not in os.environ:
     print('You must specify the path to bmpblk_utility in the $%s '
           'environment variable.' % varname)
     sys.exit(1)
   prog = os.environ[varname]
   print "Testing prog...", prog
   unittest.main()