Checkbox Provider - Base

Merge ~cypressyew/plainbox-provider-checkbox:master into plainbox-provider-checkbox:master

  1. Git
  2. lp:~cypressyew/plainbox-provider-checkbox
  3. master
  4. Merge into master
Proposed by Po-Hsu Lin
Status: Merged
Approved by: Sylvain Pineau
Approved revision: 29736a1960234591aea1ab00b5211c20d3fd5117
Merged at revision: e3c2da8876b4ed079a1e49d1b9e27dc4fcbef3ad
Proposed branch: ~cypressyew/plainbox-provider-checkbox:master
Merge into: plainbox-provider-checkbox:master
Diff against target: 39 lines (+4/-4)
1 file modified
units/suspend/suspend.pxu (+4/-4)
Reviewer Review Type Date Requested Status
Sylvain Pineau Approve
Review via email: mp+346794@code.launchpad.net

Commit message

The iperf related tests are using the network script, some of them are missing
the 'test' argument in the command and it will fail with:
    usage: network [-h] {test,info} ...
    network: error: invalid choice: 'wlp2s0' (choose from 'test', 'info')

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

Thanks +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/units/suspend/suspend.pxu b/units/suspend/suspend.pxu
2index c989f77..34d1ba4 100644
3--- a/units/suspend/suspend.pxu
4+++ b/units/suspend/suspend.pxu
5@@ -61,7 +61,7 @@ requires:
6 package.name == 'iperf'
7 user: root
8 environ: TEST_TARGET_FTP TEST_TARGET_IPERF TEST_USER TEST_PASS
9-command: network -i {interface} -t iperf
10+command: network test -i {interface} -t iperf
11 _description:
12 This test executes iperf connection performance/stability against device {__index__} ({interface}) before suspend.
13
14@@ -615,7 +615,7 @@ requires:
15 package.name == 'iperf'
16 user: root
17 environ: TEST_TARGET_FTP TEST_TARGET_IPERF TEST_USER TEST_PASS
18-command: network -i {interface} -t iperf
19+command: network test -i {interface} -t iperf
20 _description:
21 This test executes iperf connection performance/stability against device {__index__} ({interface}) after suspend.
22
23@@ -631,7 +631,7 @@ requires:
24 package.name == 'iperf'
25 user: root
26 environ: TEST_TARGET_FTP TEST_TARGET_IPERF TEST_USER TEST_PASS
27-command: network -i {interface} -t iperf
28+command: network test -i {interface} -t iperf
29 _description:
30 This test executes iperf connection performance/stability against device {__index__} ({interface}) after suspend.
31
32@@ -645,7 +645,7 @@ environ: TEST_TARGET_FTP TEST_TARGET_IPERF TEST_USER TEST_PASS
33 command:
34 INTERFACE=`(nmcli -t -f GENERAL -m tabular dev list 2>/dev/null || nmcli -t -f GENERAL -m tabular dev show) |grep gsm |cut -d ":" -f 13`
35 [ -z $INTERFACE ] && exit 1
36- network test -i $INTERFACE -t iperf
37+ network test test -i $INTERFACE -t iperf
38 _description:
39 This test executes iperf connection performance/stability against the broadband device found on the system after suspend.
40

Subscribers

People subscribed via source and target branches