From 6a5c8131f0105fb3d3da497368db70263c519904 Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Thu, 27 Dec 2012 11:10:48 +0100 Subject: Added couple of tests for mmc_id field handling. --- linaro_image_tools/hwpack/tests/test_config_v3.py | 5 +++++ linaro_image_tools/hwpack/tests/test_hwpack_converter.py | 11 +++++++++++ 2 files changed, 16 insertions(+) diff --git a/linaro_image_tools/hwpack/tests/test_config_v3.py b/linaro_image_tools/hwpack/tests/test_config_v3.py index cc63a76..0d04849 100644 --- a/linaro_image_tools/hwpack/tests/test_config_v3.py +++ b/linaro_image_tools/hwpack/tests/test_config_v3.py @@ -347,6 +347,11 @@ class ConfigTests(TestCase): self.assertValidationError("Invalid serial tty: ttxSAC1", config._validate_serial_tty) + def test_validate_mmc_id_wrong(self): + 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") diff --git a/linaro_image_tools/hwpack/tests/test_hwpack_converter.py b/linaro_image_tools/hwpack/tests/test_hwpack_converter.py index 3e830da..9028c76 100644 --- a/linaro_image_tools/hwpack/tests/test_hwpack_converter.py +++ b/linaro_image_tools/hwpack/tests/test_hwpack_converter.py @@ -166,3 +166,14 @@ class HwpackConverterTests(TestCaseWithFixtures): 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.""" + 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)) -- cgit v1.2.3 From 91897e5c99ab9a49f72caa749db19c7bfbe4d824 Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Thu, 27 Dec 2012 11:29:42 +0100 Subject: Added comments. --- linaro_image_tools/hwpack/tests/test_config_v3.py | 2 ++ linaro_image_tools/hwpack/tests/test_hwpack_converter.py | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/linaro_image_tools/hwpack/tests/test_config_v3.py b/linaro_image_tools/hwpack/tests/test_config_v3.py index 0d04849..27eb952 100644 --- a/linaro_image_tools/hwpack/tests/test_config_v3.py +++ b/linaro_image_tools/hwpack/tests/test_config_v3.py @@ -348,6 +348,8 @@ class ConfigTests(TestCase): 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) diff --git a/linaro_image_tools/hwpack/tests/test_hwpack_converter.py b/linaro_image_tools/hwpack/tests/test_hwpack_converter.py index 9028c76..4f83994 100644 --- a/linaro_image_tools/hwpack/tests/test_hwpack_converter.py +++ b/linaro_image_tools/hwpack/tests/test_hwpack_converter.py @@ -168,7 +168,11 @@ class HwpackConverterTests(TestCaseWithFixtures): self.assertEqual(out_format, str(converter)) def test_mmc_id(self): - """Test correct handling of mmc_id field.""" + """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)).\ -- cgit v1.2.3