Merge lp:~milo/linaro-image-tools/bug1085412 into lp:linaro-image-tools/11.11

[Milo Casagrande]

Add two new tests to make sure we are handling the mmc_id field correctly:
- make sure that passing an un-quoted value raises the exception
- and assure that the converter between hwpack format 2 to 3 quotes correctly

[lp:~milo/linaro-image-tools/bug1085412]

595. By Milo Casagrande on 2012-12-27

Added comments.

[Fathi Boudra (fboudra)]

+1

review: Approve

=== modified file 'linaro_image_tools/hwpack/tests/test_config_v3.py'
--- linaro_image_tools/hwpack/tests/test_config_v3.py	2012-12-07 08:47:58 +0000
+++ linaro_image_tools/hwpack/tests/test_config_v3.py	2012-12-27 10:31:23 +0000
@@ -347,6 +347,13 @@
         self.assertValidationError("Invalid serial tty: ttxSAC1",
                                    config._validate_serial_tty)
 
+    def test_validate_mmc_id_wrong(self):
+        # The mmc_id value, if coming from a yaml file, has to be quoted.
+        # Make sure the test does not accept a valid-unquoted value.
+        config = self.get_config(self.valid_complete_v3 +
+                                 "mmc_id: 1:1\n")
+        self.assertRaises(HwpackConfigError, config._validate_mmc_id)
+
     def test_validate_mmc_id(self):
         config = self.get_config(self.valid_complete_v3 +
                                  "mmc_id: x\n")
 
=== modified file 'linaro_image_tools/hwpack/tests/test_hwpack_converter.py'
--- linaro_image_tools/hwpack/tests/test_hwpack_converter.py	2012-10-17 14:53:24 +0000
+++ linaro_image_tools/hwpack/tests/test_hwpack_converter.py	2012-12-27 10:31:23 +0000
@@ -166,3 +166,18 @@
         converter = HwpackConverter(input_file, output_file)
         converter._parse()
         self.assertEqual(out_format, str(converter))
+
+    def test_mmc_id(self):
+        """Test correct handling of mmc_id field.
+
+        The mmc_id field has to be quoted coming out from the converter
+        otherwise when reading the yaml file the value is read as a number,
+        not a string."""
+        ini_format = ("[hwpack]\nformat=2.0\nmmc_id=1:1")
+        out_format = ("format: '3.0'\nmmc_id: '1:1'\n")
+        input_file = self.useFixture(CreateTempFileFixture(ini_format)).\
+                                                                get_file_name()
+        output_file = self.useFixture(CreateTempFileFixture()).get_file_name()
+        converter = HwpackConverter(input_file, output_file)
+        converter._parse()
+        self.assertEqual(out_format, str(converter))