Checkbox

Merge lp:~sylvain-pineau/checkbox/fix-1484885 into lp:checkbox

  1. fix-1484885
  2. Merge into trunk
Proposed by Sylvain Pineau
Status: Merged
Approved by: Maciej Kisielewski
Approved revision: 3960
Merged at revision: 3961
Proposed branch: lp:~sylvain-pineau/checkbox/fix-1484885
Merge into: lp:checkbox
Diff against target: 13 lines (+2/-1)
1 file modified
providers/plainbox-provider-checkbox/bin/fwts_test (+2/-1)
To merge this branch: bzr merge lp:~sylvain-pineau/checkbox/fix-1484885
Reviewer Review Type Date Requested Status
Maciej Kisielewski Approve
Review via email: mp+269161@code.launchpad.net

Description of the change

Fixes the linked bug. In short the _hwe suffix is only appended to log filename is the -t option is not used.

To post a comment you must log in.
Revision history for this message
Maciej Kisielewski (kissiel) wrote :

Looks good!
+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'providers/plainbox-provider-checkbox/bin/fwts_test'
--- providers/plainbox-provider-checkbox/bin/fwts_test 2015-07-30 12:16:37 +0000
+++ providers/plainbox-provider-checkbox/bin/fwts_test 2015-08-26 08:13:15 +0000
@@ -381,7 +381,8 @@
381 for test in tests:381 for test in tests:
382 # ACPI tests can now be run with --acpitests (fwts >= 15.07.00)382 # ACPI tests can now be run with --acpitests (fwts >= 15.07.00)
383 log = args.log383 log = args.log
384 if test in HWE_TESTS:384 # Split the log file for HWE (only if -t is not used)
385 if not args.test and test in HWE_TESTS:
385 log = log.replace('.log', '_hwe.log')386 log = log.replace('.log', '_hwe.log')
386 if test == 'acpitests':387 if test == 'acpitests':
387 test = '--acpitests'388 test = '--acpitests'

Subscribers

People subscribed via source and target branches