aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMilo Casagrande <milo.casagrande@linaro.org>2015-03-30 10:50:22 +0200
committerMilo Casagrande <milo.casagrande@linaro.org>2015-03-30 10:50:22 +0200
commit0da22a5e6d26f4bacea852c7a45daecf4bd3d04f (patch)
tree7119031a4baa6dc1b9ed3123766d1d41d6100cc8
parent412ad4b17e9edba98faff1b9c872282a06d6235f (diff)
Fix error at build import time.
* Defconfig errors variable name was wrong (typo). * Add test.
-rw-r--r--app/utils/docimport.py2
-rw-r--r--app/utils/tests/test_docimport.py28
2 files changed, 29 insertions, 1 deletions
diff --git a/app/utils/docimport.py b/app/utils/docimport.py
index df70a01..08d4575 100644
--- a/app/utils/docimport.py
+++ b/app/utils/docimport.py
@@ -333,7 +333,7 @@ def _parse_build_data(data_file, job, kernel, defconfig_dir):
models.BUILD_PLATFORM_KEY, [])
defconfig_doc.build_time = data_pop(models.BUILD_TIME_KEY, 0)
defconfig_doc.dtb_dir = data_pop(models.DTB_DIR_KEY, None)
- defconfig_doc.errros = data_pop(models.BUILD_ERRORS_KEY, 0)
+ defconfig_doc.errors = data_pop(models.BUILD_ERRORS_KEY, 0)
defconfig_doc.file_server_resource = data_pop(
models.FILE_SERVER_RESOURCE_KEY, None)
defconfig_doc.file_server_url = data_pop(
diff --git a/app/utils/tests/test_docimport.py b/app/utils/tests/test_docimport.py
index de559a7..7349f25 100644
--- a/app/utils/tests/test_docimport.py
+++ b/app/utils/tests/test_docimport.py
@@ -181,6 +181,34 @@ class TestDocImport(unittest.TestCase):
defconf_doc.defconfig_full, "defoo_confbar+CONFIG_TEST=y")
self.assertEqual(defconf_doc.defconfig, "defoo_confbar")
+ def test_parse_and_update_build_metadata_errors(self):
+ meta_content = {
+ "arch": "arm",
+ "defconfig": "defoo_confbar",
+ "job": "job",
+ "kernel": "kernel",
+ "build_errors": 3,
+ "build_warnings": 1,
+ }
+
+ try:
+ fake_meta = tempfile.NamedTemporaryFile(delete=False)
+ with open(fake_meta.name, 'w') as w_file:
+ w_file.write(json.dumps(meta_content))
+
+ defconf_doc = docimport._parse_build_data(
+ fake_meta.name,
+ "job",
+ "kernel",
+ "arm-defoo_confbar"
+ )
+ finally:
+ os.unlink(fake_meta.name)
+
+ self.assertIsInstance(defconf_doc, mdefconfig.DefconfigDocument)
+ self.assertEqual(defconf_doc.errors, 3)
+ self.assertEqual(defconf_doc.warnings, 1)
+
def test_extrapolate_defconfig_full_non_valid(self):
kconfig_fragments = "foo-CONFIG.bar"
defconfig = "defconfig"