summaryrefslogtreecommitdiff
diff options
authorcgregan@canonical.com <>2014-06-10 16:39:29 -0400
committercgregan@canonical.com <>2014-06-10 16:39:29 -0400
commit3727463ba6065be9664719fdf174d0b9cdc314d8 (patch)
tree6b4cbbafcd527ff35fcff8b92a673452c8c2dc21
parentd9ca67a4f5e6160e1839e832884a031a271f276f (diff)
fixing before suspend and depends lines
-rw-r--r--jobs/suspend.txt.in36
1 files changed, 25 insertions, 11 deletions
diff --git a/jobs/suspend.txt.in b/jobs/suspend.txt.in
index 9bf766a..9920e28 100644
--- a/jobs/suspend.txt.in
+++ b/jobs/suspend.txt.in
@@ -82,16 +82,30 @@ _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_auto
- depends: ethernet/detect
- estimated_duration: 20.0
- user: root
- command: network -i -t iperf
- _description:
- This test executes iperf connection performance/stability against all the ethernet devices found on the system before suspend.
- EOF
+id: suspend/iperf_before_suspend_mobilebroadband_gsm_auto
+depends: mobilebroadband/gsm_connection
+estimated_duration: 20.0
+user: root
+environ: GSM_CONN_NAME GSM_APN GSM_USERNAME GSM_PASSWORD
+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 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.
+ 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: CDMA_CONN_NAME CDMA_USERNAME CDMA_PASSWORD
+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
@@ -688,7 +702,7 @@ _description:
plugin: shell
id: suspend/iperf_after_suspend_mobilebroadband_gsm_auto
-depends: ethernet/detect
+depends: suspend/suspend_advanced_auto
estimated_duration: 20.0
user: root
environ: GSM_CONN_NAME GSM_APN GSM_USERNAME GSM_PASSWORD
@@ -701,7 +715,7 @@ _description:
plugin: shell
id: suspend/iperf_after_suspend_mobilebroadband_cdma_auto
-depends: ethernet/detect
+depends: suspend/suspend_advanced_auto
estimated_duration: 20.0
user: root
environ: CDMA_CONN_NAME CDMA_USERNAME CDMA_PASSWORD