Merge ~sylvain-pineau/checkbox-ng:fix-xlsx-missing-results into checkbox-ng:master

Proposed by Sylvain Pineau
Status: Merged
Approved by: Sylvain Pineau
Approved revision: 97730dbe31a4264205e3fbd8b15a8e21296487eb
Merged at revision: 0d7d57ed75752083656017114344dfef4b69e211
Proposed branch: ~sylvain-pineau/checkbox-ng:fix-xlsx-missing-results
Merge into: checkbox-ng:master
Diff against target: 31 lines (+3/-3)
1 file modified
plainbox/impl/exporter/xlsx.py (+3/-3)
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Review via email: mp+354300@code.launchpad.net

Description of the change

hotfix of the xlsx exporter, the test result worksheet was missing in standard exports.

To post a comment you must log in.
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

self-approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/plainbox/impl/exporter/xlsx.py b/plainbox/impl/exporter/xlsx.py
2index f582339..0e03f8b 100644
3--- a/plainbox/impl/exporter/xlsx.py
4+++ b/plainbox/impl/exporter/xlsx.py
5@@ -794,7 +794,7 @@ class XLSXSessionStateExporter(SessionStateExporterBase):
6 if self.OPTION_WITH_SYSTEM_INFO in self._option_list:
7 self.worksheet1 = self.workbook.add_worksheet(_('System Info'))
8 self.write_systeminfo(data)
9- if not self.OPTION_TEST_PLAN_EXPORT:
10+ if not self.OPTION_TEST_PLAN_EXPORT in self._option_list:
11 self.worksheet3 = self.workbook.add_worksheet(_('Test Results'))
12 if (
13 self.OPTION_WITH_DESCRIPTION in self._option_list or
14@@ -802,7 +802,7 @@ class XLSXSessionStateExporter(SessionStateExporterBase):
15 ):
16 self.worksheet4 = self.workbook.add_worksheet(
17 _('Test Descriptions'))
18- if self.OPTION_TEST_PLAN_EXPORT:
19+ if self.OPTION_TEST_PLAN_EXPORT in self._option_list:
20 self.write_tp_export(data)
21 else:
22 self.write_results(data)
23@@ -812,7 +812,7 @@ class XLSXSessionStateExporter(SessionStateExporterBase):
24 if self.OPTION_WITH_TEXT_ATTACHMENTS in self._option_list:
25 self.worksheet5 = self.workbook.add_worksheet(_('Log Files'))
26 self.write_attachments(data)
27- if not self.OPTION_TEST_PLAN_EXPORT:
28+ if not self.OPTION_TEST_PLAN_EXPORT in self._option_list:
29 self.worksheet6 = self.workbook.add_worksheet(_('Resources Logs'))
30 self.write_resources(data)
31 for worksheet in self.workbook.worksheets():

Subscribers

People subscribed via source and target branches