"automatic merge by tarmac [r=roadmr][bug=][author=cgregan]"

3 files changed, 118 insertions, 0 deletions

diff --git a/jobs/info.txt.in b/jobs/info.txt.in
index 940b00a..876538d 100644
--- a/jobs/info.txt.in
+++ b/jobs/info.txt.in
@@ -216,6 +216,12 @@ estimated_duration: 0.550
 _description: Provides information about network devices
 
 plugin: attachment
+id: info/mobile_broadband_info
+command: broadband_info
+estimated_duration: 0.5
+_description: Provides information about wwan/mobile broadband devices
+
+plugin: attachment
 id: info/xrandr
 command: xrandr -q --verbose
 _description: Provides information about displays attached to the system
diff --git a/jobs/mobilebroadband.txt.in b/jobs/mobilebroadband.txt.in
index eab4e4c..14d734c 100644
--- a/jobs/mobilebroadband.txt.in
+++ b/jobs/mobilebroadband.txt.in
@@ -55,3 +55,62 @@ command:
 exit $EXIT_CODE
 _description: Creates a mobile broadband connection for a CDMA based modem and checks the connection to ensure it's working.
 
+plugin: local
+id: mobilebroadband/maximum_bandwidth_gsm
+requires:
+ device.category == 'NETWORK'
+ package.name == 'zenity'
+ package.name == 'iperf'
+depends: mobilebroadband/gsm_connection
+command:
+ cat <<'EOF' | run_templates -s 'udev_resource | filter_templates -w "category=NETWORK" | awk "/path: / { print \$2 }" | xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do echo \$0 \$i; done"'
+ plugin: user-verify
+ user: root
+ id: mobilebroadband/maximum_bandwidth_$2
+ requires: device.path == "$1"
+ environ: TEST_TARGET_FTP TEST_TARGET_IPERF TEST_USER TEST_PASS
+ command: network test -i $2 -t iperf 2>&1 | cat - <(echo; echo "Verify the result and click OK to decide on the outcome") | zenity --text-info --title 'mobile broadband max bw $2'
+ estimated_duration: 330.0
+ _description:
+ PURPOSE:
+ User verification of whether the observed transfer throughput is acceptable
+ for the type and maximum speed of each interface.
+ STEPS:
+ 1. Read the network test summary and confirm that the throughput is acceptable.
+ 2. If needed, click "Test" again to repeat the transfer test.
+ VERIFICATION:
+ Was the reported throughput acceptable for the type and maximum speed of this interface?
+ EOF
+_description:
+ This test executes a maximum throughput test against all the devices found on the system.
+
+plugin: local
+id: mobilebroadband/maximum_bandwidth_cdma
+requires:
+ device.category == 'NETWORK'
+ package.name == 'zenity'
+ package.name == 'iperf'
+depends: mobilebroadband/cdma_connection
+command:
+ cat <<'EOF' | run_templates -s 'udev_resource | filter_templates -w "category=NETWORK" | awk "/path: / { print \$2 }" | xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do echo \$0 \$i; done"'
+ plugin: user-verify
+ user: root
+ id: mobilebroadband/maximum_bandwidth_$2
+ requires: device.path == "$1"
+ environ: TEST_TARGET_FTP TEST_TARGET_IPERF TEST_USER TEST_PASS
+ command: network test -i $2 -t iperf 2>&1 | cat - <(echo; echo "Verify the result and click OK to decide on the outcome") | zenity --text-info --title 'mobile broadband max bw $2'
+ estimated_duration: 330.0
+ _description:
+ PURPOSE:
+ User verification of whether the observed transfer throughput is acceptable
+ for the type and maximum speed of each interface.
+ STEPS:
+ 1. Read the network test summary and confirm that the throughput is acceptable.
+ 2. If needed, click "Test" again to repeat the transfer test.
+ VERIFICATION:
+ Was the reported throughput acceptable for the type and maximum speed of this interface?
+ EOF
+_description:
+ This test executes a maximum throughput test against all the devices found on the system.
+
+
diff --git a/jobs/suspend.txt.in b/jobs/suspend.txt.in
index 51eb4b5..f9b2dc0 100644
--- a/jobs/suspend.txt.in
+++ b/jobs/suspend.txt.in
@@ -82,6 +82,33 @@ _description:
 This is an automated test to gather some info on the current state of your network devices. If no devices are found, the test will exit with an error.
 
 plugin: shell
+id: suspend/iperf_before_suspend_mobilebroadband_gsm_auto
+depends: mobilebroadband/gsm_connection
+estimated_duration: 20.0
+user: root
+environ: TEST_TARGET_FTP TEST_TARGET_IPERF TEST_USER TEST_PASS
+command: 
+ INTERFACE=`nmcli -t -f GENERAL -m tabular dev list |grep gsm |cut -d ":" -f 13`
+ [ -z $INTERFACE ] && exit 1
+ network -i $INTERFACE -t iperf
+_description:
+ This test executes iperf connection performance/stability against the broadband device found on the system before suspend.
+
+plugin: shell
+id: suspend/iperf_before_suspend_mobilebroadband_cdma_auto
+depends: mobilebroadband/cdma_connection
+estimated_duration: 20.0
+user: root
+environ: TEST_TARGET_FTP TEST_TARGET_IPERF TEST_USER TEST_PASS
+command: 
+ INTERFACE=`nmcli -t -f GENERAL -m tabular dev list |grep cdma |cut -d ":" -f 13`
+ [ -z $INTERFACE ] && exit 1
+ network -i $INTERFACE -t iperf
+_description:
+ This test executes iperf connection performance/stability against the broadband device found on the system before suspend.
+
+
+plugin: shell
 id: suspend/bluetooth_obex_before_suspend
 estimated_duration: 10.0
 requires:
@@ -673,6 +700,32 @@ command:
 _description:
 This is an automated test to gather some info on the current state of your network devices. If no devices are found, the test will exit with an error.
 
+plugin: shell
+id: suspend/iperf_after_suspend_mobilebroadband_gsm_auto
+depends: suspend/suspend_advanced_auto
+estimated_duration: 20.0
+user: root
+environ: TEST_TARGET_FTP TEST_TARGET_IPERF TEST_USER TEST_PASS
+command: 
+ INTERFACE=`nmcli -t -f GENERAL -m tabular dev list |grep gsm |cut -d ":" -f 13`
+ [ -z $INTERFACE ] && exit 1
+ network -i $INTERFACE -t iperf
+_description:
+ This test executes iperf connection performance/stability against the broadband device found on the system before suspend.
+
+plugin: shell
+id: suspend/iperf_after_suspend_mobilebroadband_cdma_auto
+depends: suspend/suspend_advanced_auto
+estimated_duration: 20.0
+user: root
+environ: TEST_TARGET_FTP TEST_TARGET_IPERF TEST_USER TEST_PASS
+command: 
+ INTERFACE=`nmcli -t -f GENERAL -m tabular dev list |grep cdma |cut -d ":" -f 13`
+ [ -z $INTERFACE ] && exit 1
+ network -i $INTERFACE -t iperf
+_description:
+ This test executes iperf connection performance/stability against the broadband device found on the system before suspend.
+
 plugin: user-interact-verify
 id: suspend/wireless_connection_after_suspend_wpa_bg_manual
 depends: suspend/suspend_advanced