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

Proposed by Sylvain Pineau
Status: Merged
Approved by: Sylvain Pineau
Approved revision: f4ebf20f3ef1c2a694617fd08cb467ca01acd866
Merged at revision: d8814f8229993d1d27262848c1052c0894d3d349
Proposed branch: ~sylvain-pineau/checkbox-ng:fix-1804172
Merge into: checkbox-ng:master
Diff against target: 26 lines (+2/-2)
2 files modified
checkbox_ng/launcher/merge_reports.py (+1/-1)
checkbox_ng/launcher/merge_submissions.py (+1/-1)
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Review via email: mp+359534@code.launchpad.net

Description of the change

Fixes the linked bug. -o should indeed be a mandatory arg to all merge commands.

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
diff --git a/checkbox_ng/launcher/merge_reports.py b/checkbox_ng/launcher/merge_reports.py
index c9efa74..bafd977 100644
--- a/checkbox_ng/launcher/merge_reports.py
+++ b/checkbox_ng/launcher/merge_reports.py
@@ -45,7 +45,7 @@ class MergeReports(Command):
45 'submission', nargs='*', metavar='SUBMISSION',45 'submission', nargs='*', metavar='SUBMISSION',
46 help='submission tarball')46 help='submission tarball')
47 parser.add_argument(47 parser.add_argument(
48 '-o', '--output-file', metavar='FILE',48 '-o', '--output-file', metavar='FILE', required=True,
49 help='save combined test results to the specified FILE')49 help='save combined test results to the specified FILE')
5050
51 def _parse_submission(self, submission, tmpdir, mode="list"):51 def _parse_submission(self, submission, tmpdir, mode="list"):
diff --git a/checkbox_ng/launcher/merge_submissions.py b/checkbox_ng/launcher/merge_submissions.py
index b73852b..adab550 100644
--- a/checkbox_ng/launcher/merge_submissions.py
+++ b/checkbox_ng/launcher/merge_submissions.py
@@ -35,7 +35,7 @@ class MergeSubmissions(MergeReports):
35 'submission', nargs='*', metavar='SUBMISSION',35 'submission', nargs='*', metavar='SUBMISSION',
36 help='submission tarball')36 help='submission tarball')
37 parser.add_argument(37 parser.add_argument(
38 '-o', '--output-file', metavar='FILE',38 '-o', '--output-file', metavar='FILE', required=True,
39 help='save combined test results to the specified FILE')39 help='save combined test results to the specified FILE')
40 parser.add_argument(40 parser.add_argument(
41 '--title', action='store', metavar='SESSION_NAME',41 '--title', action='store', metavar='SESSION_NAME',

Subscribers

People subscribed via source and target branches