Merge ~kissiel/checkbox-ng:fix-1957187 into checkbox-ng:master

Proposed by Maciej Kisielewski
Status: Merged
Approved by: Maciej Kisielewski
Approved revision: e237a907075924f5a311048d34c9b6912457eb86
Merged at revision: 4bb52f96ac8304e882158f48188974d7e242e589
Proposed branch: ~kissiel/checkbox-ng:fix-1957187
Merge into: checkbox-ng:master
Diff against target: 16 lines (+5/-0)
1 file modified
checkbox_ng/launcher/stages.py (+5/-0)
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Review via email: mp+414359@code.launchpad.net

Description of the change

This patch fixes an issue where traceback would be printed when secureID was wrong and the session was an automated one.

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

+1 to remove the traceback, not sure it actually solves the problem of the empty secure id though.

review: Approve
Revision history for this message
Maciej Kisielewski (kissiel) wrote :

It fixes the traceback :D

The handing over of secureID still needs to be fixed. But that's not a Checkbox jurisdiction anymore.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/checkbox_ng/launcher/stages.py b/checkbox_ng/launcher/stages.py
2index 84bdfe1..126324b 100644
3--- a/checkbox_ng/launcher/stages.py
4+++ b/checkbox_ng/launcher/stages.py
5@@ -511,6 +511,11 @@ class ReportsStage(CheckboxUiStage):
6 continue
7 except InvalidSecureIDError:
8 _logger.warning(_("Invalid secure_id"))
9+ if not self.is_interactive:
10+ # secure_id will not magically change if the session
11+ # is a non-interactive one, so let's stop trying
12+ done_sending = True
13+ continue
14 if self._retry_dialog():
15 self.sa.config.transports['c3'].pop('secure_id')
16 continue

Subscribers

People subscribed via source and target branches