diff options
| author | Milo Casagrande <milo.casagrande@linaro.org> | 2014-12-19 14:34:30 +0100 |
|---|---|---|
| committer | Milo Casagrande <milo.casagrande@linaro.org> | 2014-12-19 14:34:30 +0100 |
| commit | b2ef352d536c971007c1148f7be3e48d940bdaef (patch) | |
| tree | e5db8473cfbda9af6b6c485d8c2755449c6115c7 /app/models | |
| parent | 5ae7f8e4c81f029b4ec508b42ff86a75397ade95 (diff) | |
Add support for the 'mach' key to boot model.
Change-Id: I1fd499163d51f741145dc5d17d18dc03a8560ae5
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/boot.py | 2 | ||||
| -rw-r--r-- | app/models/tests/test_boot_model.py | 35 |
2 files changed, 21 insertions, 16 deletions
diff --git a/app/models/boot.py b/app/models/boot.py index f5e75cd..1d02b4b 100644 --- a/app/models/boot.py +++ b/app/models/boot.py @@ -89,6 +89,7 @@ class BootDocument(modb.BaseDocument): self.job_id = None self.kernel_image = None self.load_addr = None + self.mach = None self.metadata = {} self.qemu = None self.qemu_command = None @@ -223,6 +224,7 @@ class BootDocument(modb.BaseDocument): models.KERNEL_KEY: self.kernel, models.LAB_NAME_KEY: self.lab_name, models.LOAD_ADDR_KEY: self.load_addr, + models.MACH_KEY: self.mach, models.METADATA_KEY: self.metadata, models.NAME_KEY: self.name, models.QEMU_COMMAND_KEY: self.qemu_command, diff --git a/app/models/tests/test_boot_model.py b/app/models/tests/test_boot_model.py index 125a469..c34cecb 100644 --- a/app/models/tests/test_boot_model.py +++ b/app/models/tests/test_boot_model.py @@ -55,21 +55,33 @@ class TestBootModel(unittest.TestCase): boot_doc.qemu = "qemu_binary" boot_doc.qemu_command = "qemu_command" boot_doc.metadata = {"foo": "bar"} + boot_doc.mach = "soc" expected = { "_id": "id", + "arch": "arm", "board": "board", + "board_instance": "instance", "boot_log": "boot-log", "boot_log_html": "boot-log-html", "boot_result_description": None, "created_on": "now", "defconfig": "defconfig", + "defconfig_full": "defconfig", "defconfig_id": "defconfig_id", "dtb": None, "dtb_addr": None, "dtb_append": False, "endian": None, "fastboot": False, + "fastboot_cmd": "fastboot", + "file_server_resource": "file-resource", + "file_server_url": "file-server", + "git_branch": "git-branch", + "git_commit": "git-commit", + "git_describe": "git-describe", + "git_url": "git-url", + "initrd": "initrd", "initrd_addr": None, "job": "job", "job_id": "job-id", @@ -77,28 +89,18 @@ class TestBootModel(unittest.TestCase): "kernel_image": None, "lab_name": "lab", "load_addr": None, + "mach": "soc", "metadata": {"foo": "bar"}, "name": "board-job-kernel-defconfig-arm", + "qemu": "qemu_binary", + "qemu_command": "qemu_command", "retries": 10, "status": None, "time": 0, - "version": "1.0", - "warnings": 2, - "git_commit": "git-commit", - "git_branch": "git-branch", - "git_describe": "git-describe", - "git_url": "git-url", - "arch": "arm", - "fastboot_cmd": "fastboot", - "defconfig_full": "defconfig", - "file_server_url": "file-server", - "file_server_resource": "file-resource", - "initrd": "initrd", - "board_instance": "instance", "uimage": "path/to/uImage", "uimage_addr": "uimage_addr", - "qemu": "qemu_binary", - "qemu_command": "qemu_command" + "version": "1.0", + "warnings": 2 } self.assertDictEqual(expected, boot_doc.to_dict()) @@ -152,6 +154,7 @@ class TestBootModel(unittest.TestCase): "kernel_image": "kernel_image", "lab_name": "lab", "load_addr": "12345", + "mach": "soc", "metadata": {"foo": "bar"}, "name": "board-job-kernel-defconfig_full-arm", "qemu": "qemu_binary", @@ -162,7 +165,7 @@ class TestBootModel(unittest.TestCase): "uimage": "path/to/uImage", "uimage_addr": "uimage_addr", "version": "1.0", - "warnings": 2, + "warnings": 2 } boot_doc = mboot.BootDocument.from_json(boot_json) |