Merge ~sylvain-pineau/checkbox-ng:remote_display_missing_verification_msg into checkbox-ng:master

Proposed by Sylvain Pineau
Status: Merged
Approved by: Sylvain Pineau
Approved revision: db33f43e3772097d1c8a93aa5aabf9d58f0cc01d
Merged at revision: 482f61fb4639ca96c6f6857e3a74cebac21ada64
Proposed branch: ~sylvain-pineau/checkbox-ng:remote_display_missing_verification_msg
Merge into: checkbox-ng:master
Diff against target: 24 lines (+7/-1)
1 file modified
checkbox_ng/launcher/remote.py (+7/-1)
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Review via email: mp+360384@code.launchpad.net

Description of the change

Remote does no display the verification instructions, this patch fixes the problem.

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/checkbox_ng/launcher/remote.py b/checkbox_ng/launcher/remote.py
2index 7e7dd61..70bdc60 100644
3--- a/checkbox_ng/launcher/remote.py
4+++ b/checkbox_ng/launcher/remote.py
5@@ -394,12 +394,18 @@ class RemoteMaster(Command, ReportsStage, MainLoopStage):
6 SimpleUI.description(_('Purpose:'), interaction.message)
7 elif interaction.kind in ['description', 'steps']:
8 SimpleUI.description(_('Steps:'), interaction.message)
9- cmd = SimpleUI(None).wait_for_interaction_prompt(None)
10+ if job['command'] is None:
11+ cmd = 'run'
12+ else:
13+ cmd = SimpleUI(None).wait_for_interaction_prompt(None)
14 if cmd == 'skip':
15 next_job = True
16 self.sa.remember_users_response(cmd)
17 elif interaction.kind == 'verification':
18 self.wait_for_job(dont_finish=True)
19+ if interaction.message:
20+ SimpleUI.description(
21+ _('Verification:'), interaction.message)
22 JobAdapter = namedtuple('job_adapter', ['command'])
23 job = JobAdapter(job['command'])
24 cmd = SimpleUI(None)._interaction_callback(

Subscribers

People subscribed via source and target branches