Merge ~sylvain-pineau/checkbox-ng:fix-1896881 into checkbox-ng:master

[Sylvain Pineau]

exporter:json: Only add the devices list if the udev_json attachment is non empty

Fixes the linked bug

[Sylvain Pineau (sylvain-pineau)]

self-approved

review: Approve

[Devices Certification Bot (ce-certification-qa)]

The merge was fine but running tests failed.

[xenial] [04:01:07] starting container
[focal] [04:01:10] starting container
[bionic] [04:01:11] starting container
Device project added to xenial-testing
Device project added to focal-testing
Device project added to bionic-testing
[xenial] [04:01:25] provisioning container
[bionic] [04:01:32] provisioning container
[focal] [04:01:32] provisioning container
[xenial] [04:03:21] Starting tests...
[xenial] Found a test script: ./requirements/001-container-tests-plainbox-egg-info
[xenial] [04:03:23] 001-container-tests-plainbox-egg-info: PASS
[xenial] Found a test script: ./requirements/container-tests-checkbox-documentation
[bionic] [04:03:28] Starting tests...
[bionic] Found a test script: ./requirements/001-container-tests-plainbox-egg-info
[xenial] [04:03:28] container-tests-checkbox-documentation: PASS
[xenial] Found a test script: ./requirements/container-tests-checkbox-ng-unit
[bionic] [04:03:29] 001-container-tests-plainbox-egg-info: PASS
[bionic] Found a test script: ./requirements/container-tests-checkbox-documentation
[bionic] [04:03:33] container-tests-checkbox-documentation: PASS
[bionic] Found a test script: ./requirements/container-tests-checkbox-ng-unit
[xenial] [04:03:33] container-tests-checkbox-ng-unit: PASS
[xenial] Found a test script: ./requirements/container-tests-providers-internal
[focal] [04:03:35] Starting tests...
[focal] Found a test script: ./requirements/001-container-tests-plainbox-egg-info
[xenial] [04:03:35] container-tests-providers-internal: PASS
[xenial] [04:03:35] Fixing file permissions in source directory
[focal] [04:03:35] 001-container-tests-plainbox-egg-info: PASS
[focal] Found a test script: ./requirements/container-tests-checkbox-documentation
[xenial] [04:03:35] Destroying container
[bionic] [04:03:39] container-tests-checkbox-ng-unit: PASS
[bionic] Found a test script: ./requirements/container-tests-providers-internal
[focal] [04:03:39] container-tests-checkbox-documentation: PASS
[focal] Found a test script: ./requirements/container-tests-checkbox-ng-unit
[focal] [04:03:41] container-tests-checkbox-ng-unit: FAIL
[bionic] [04:03:42] container-tests-providers-internal: PASS
[bionic] [04:03:42] Fixing file permissions in source directory
[bionic] [04:03:42] Destroying container
[focal] output: https://paste.ubuntu.com/p/x8bHxtptnW/
[focal] Found a test script: ./requirements/container-tests-providers-internal
[focal] [04:03:46] container-tests-providers-internal: PASS
[focal] [04:03:46] Fixing file permissions in source directory
[focal] [04:03:46] Destroying container

review: Needs Fixing

diff --git a/plainbox/impl/providers/exporters/data/checkbox.json b/plainbox/impl/providers/exporters/data/checkbox.json
index d49a121..a9f8771 100644
--- a/plainbox/impl/providers/exporters/data/checkbox.json
+++ b/plainbox/impl/providers/exporters/data/checkbox.json
@@ -120,10 +120,12 @@
 {%- set dkms_info_json = '{' + state.job_state_map[ns ~ 'dkms_info_json'].result.io_log_as_text_attachment.split('{', 1)[-1] %}
     "dkms_info": {{ dkms_info_json | indent(4, false) | safe }}
 {%- endif %}
-{%- if ns ~ 'udev_json' in state.job_state_map and state.job_state_map[ns ~ 'udev_json'].result.outcome == 'pass' %},
+{%- if ns ~ 'udev_json' in state.job_state_map and state.job_state_map[ns ~ 'udev_json'].result.outcome == 'pass' %}
 {%- set udev_json = state.job_state_map[ns ~ 'udev_json'].result.io_log_as_text_attachment %}
+{%- if udev_json %},
     "devices": {{ udev_json | indent(4, false) | safe }}
 {%- endif %}
+{%- endif %}
 {%- if ns ~ 'raw_devices_dmi_json' in state.job_state_map and state.job_state_map[ns ~ 'raw_devices_dmi_json'].result.outcome == 'pass' %},
 {%- set raw_devices_dmi_json = state.job_state_map[ns ~ 'raw_devices_dmi_json'].result.io_log_as_text_attachment %}
     "raw-devices-dmi": {{ raw_devices_dmi_json | indent(4, false) | safe }}