providers:checkbox: Updated suspend tests to show wireless interface info

1 files changed, 162 insertions, 18 deletions

diff --git a/jobs/suspend.txt.in b/jobs/suspend.txt.in
index fb9f6d2..cb5c0d0 100644
--- a/jobs/suspend.txt.in
+++ b/jobs/suspend.txt.in
@@ -501,7 +501,15 @@ requires:
 environment.ROUTERS == 'multiple'
 user: root
 environ: WPA_BG_SSID WPA_BG_PSK
-command: trap "rm -f /etc/NetworkManager/system-connections/$WPA_BG_SSID" EXIT; create_connection wifi $WPA_BG_SSID --security=wpa --key=$WPA_BG_PSK; gateway_ping_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+command:
+ trap "nmcli con delete id $WPA_BG_SSID" EXIT
+ if create_connection wifi $WPA_BG_SSID --security=wpa --key=$WPA_BG_PSK; then
+ INTERFACE=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+ iw dev $INTERFACE link
+ gateway_ping_test --interface=$INTERFACE
+ else
+ exit 1
+ fi
 _description:
 Tests that the systems wireless hardware can connect to a router using WPA
 security and the 802.11b/g protocols after the system has been suspended.
@@ -515,7 +523,15 @@ requires:
 environment.ROUTERS == 'multiple'
 user: root
 environ: OPEN_BG_SSID
-command: trap "rm -f /etc/NetworkManager/system-connections/$OPEN_BG_SSID" EXIT; create_connection wifi $OPEN_BG_SSID; gateway_ping_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+command:
+ trap "nmcli con delete id $OPEN_BG_SSID" EXIT
+ if create_connection wifi $OPEN_BG_SSID; then
+ INTERFACE=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+ iw dev $INTERFACE link
+ gateway_ping_test --interface=$INTERFACE
+ else
+ exit 1
+ fi
 _description:
 Tests that the systems wireless hardware can connect to a router using no
 security and the 802.11b/g protocols after the system has been suspended.
@@ -529,7 +545,15 @@ requires:
 environment.ROUTERS == 'multiple'
 user: root
 environ: WPA_N_SSID WPA_N_PSK
-command: trap "rm -f /etc/NetworkManager/system-connections/$WPA_N_SSID" EXIT; create_connection wifi $WPA_N_SSID --security=wpa --key=$WPA_N_PSK; gateway_ping_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+command:
+ trap "nmcli con delete id $WPA_N_SSID" EXIT
+ if create_connection wifi $WPA_N_SSID --security=wpa --key=$WPA_N_PSK; then
+ INTERFACE=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+ iw dev $INTERFACE link
+ gateway_ping_test --interface=$INTERFACE
+ else
+ exit 1
+ fi
 _description:
 Tests that the systems wireless hardware can connect to a router using WPA
 security and the 802.11n protocol after the system has been suspended.
@@ -543,7 +567,15 @@ requires:
 environment.ROUTERS == 'multiple'
 user: root
 environ: OPEN_N_SSID
-command: trap "rm -f /etc/NetworkManager/system-connections/$OPEN_N_SSID" EXIT; create_connection wifi $OPEN_N_SSID; gateway_ping_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+command:
+ trap "nmcli con delete id $OPEN_N_SSID" EXIT
+ if create_connection wifi $OPEN_N_SSID; then
+ INTERFACE=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+ iw dev $INTERFACE link
+ gateway_ping_test --interface=$INTERFACE
+ else
+ exit 1
+ fi
 _description:
 Tests that the systems wireless hardware can connect to a router using no
 security and the 802.11n protocol after the system has been suspended.
@@ -558,7 +590,15 @@ requires:
 IEEE_80211.ac == 'supported'
 user: root
 environ: WPA_AC_SSID WPA_AC_PSK
-command: trap "rm -f /etc/NetworkManager/system-connections/$WPA_AC_SSID" EXIT; create_connection wifi $WPA_AC_SSID --security=wpa --key=$WPA_AC_PSK; gateway_ping_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+command:
+ trap "nmcli con delete id $WPA_AC_SSID" EXIT
+ if create_connection wifi $WPA_AC_SSID --security=wpa --key=$WPA_AC_PSK; then
+ INTERFACE=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+ iw dev $INTERFACE link
+ gateway_ping_test --interface=$INTERFACE
+ else
+ exit 1
+ fi
 _description:
 Tests that the systems wireless hardware can connect to a router using WPA
 security and the 802.11ac protocol after the system has been suspended.
@@ -573,7 +613,15 @@ requires:
 IEEE_80211.ac == 'supported'
 user: root
 environ: OPEN_AC_SSID
-command: trap "rm -f /etc/NetworkManager/system-connections/$OPEN_AC_SSID" EXIT; create_connection wifi $OPEN_AC_SSID; gateway_ping_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+command:
+ trap "nmcli con delete id $OPEN_AC_SSID" EXIT
+ if create_connection wifi $OPEN_AC_SSID; then
+ INTERFACE=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+ iw dev $INTERFACE link
+ gateway_ping_test --interface=$INTERFACE
+ else
+ exit 1
+ fi
 _description:
 Tests that the systems wireless hardware can connect to a router using no
 security and the 802.11ac protocol after the system has been suspended.
@@ -587,7 +635,15 @@ requires:
 environment.ROUTERS == 'multiple'
 user: root
 environ: WPA_BG_SSID WPA_BG_PSK
-command: trap "rm -f /etc/NetworkManager/system-connections/$WPA_BG_SSID" EXIT; create_connection wifi $WPA_BG_SSID --security=wpa --key=$WPA_BG_PSK; gateway_ping_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+command:
+ trap "nmcli con delete id $WPA_BG_SSID" EXIT
+ if create_connection wifi $WPA_BG_SSID --security=wpa --key=$WPA_BG_PSK; then
+ INTERFACE=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+ iw dev $INTERFACE link
+ gateway_ping_test --interface=$INTERFACE
+ else
+ exit 1
+ fi
 _description:
 Tests that the systems wireless hardware can connect to a router using WPA
 security and the 802.11b/g protocols after the system has been suspended.
@@ -601,7 +657,15 @@ requires:
 environment.ROUTERS == 'multiple'
 user: root
 environ: OPEN_BG_SSID
-command: trap "rm -f /etc/NetworkManager/system-connections/$OPEN_BG_SSID" EXIT; create_connection wifi $OPEN_BG_SSID; gateway_ping_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+command:
+ trap "nmcli con delete id $OPEN_BG_SSID" EXIT
+ if create_connection wifi $OPEN_BG_SSID; then
+ INTERFACE=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+ iw dev $INTERFACE link
+ gateway_ping_test --interface=$INTERFACE
+ else
+ exit 1
+ fi
 _description:
 Tests that the systems wireless hardware can connect to a router using no
 security and the 802.11b/g protocols after the system has been suspended.
@@ -615,7 +679,15 @@ requires:
 environment.ROUTERS == 'multiple'
 user: root
 environ: WPA_N_SSID WPA_N_PSK
-command: trap "rm -f /etc/NetworkManager/system-connections/$WPA_N_SSID" EXIT; create_connection wifi $WPA_N_SSID --security=wpa --key=$WPA_N_PSK; gateway_ping_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+command:
+ trap "nmcli con delete id $WPA_N_SSID" EXIT
+ if create_connection wifi $WPA_N_SSID --security=wpa --key=$WPA_N_PSK; then
+ INTERFACE=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+ iw dev $INTERFACE link
+ gateway_ping_test --interface=$INTERFACE
+ else
+ exit 1
+ fi
 _description:
 Tests that the systems wireless hardware can connect to a router using WPA
 security and the 802.11n protocol after the system has been suspended.
@@ -629,7 +701,15 @@ requires:
 environment.ROUTERS == 'multiple'
 user: root
 environ: OPEN_N_SSID
-command: trap "rm -f /etc/NetworkManager/system-connections/$OPEN_N_SSID" EXIT; create_connection wifi $OPEN_N_SSID; gateway_ping_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+command:
+ trap "nmcli con delete id $OPEN_N_SSID" EXIT
+ if create_connection wifi $OPEN_N_SSID; then
+ INTERFACE=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+ iw dev $INTERFACE link
+ gateway_ping_test --interface=$INTERFACE
+ else
+ exit 1
+ fi
 _description:
 Tests that the systems wireless hardware can connect to a router using no
 security and the 802.11n protocol after the system has been suspended.
@@ -643,7 +723,15 @@ requires:
 environment.ROUTERS == 'multiple'
 user: root
 environ: WPA_AC_SSID WPA_AC_PSK
-command: trap "rm -f /etc/NetworkManager/system-connections/$WPA_AC_SSID" EXIT; create_connection wifi $WPA_AC_SSID --security=wpa --key=$WPA_AC_PSK; gateway_ping_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+command:
+ trap "nmcli con delete id $WPA_AC_SSID" EXIT
+ if create_connection wifi $WPA_AC_SSID --security=wpa --key=$WPA_AC_PSK; then
+ INTERFACE=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+ iw dev $INTERFACE link
+ gateway_ping_test --interface=$INTERFACE
+ else
+ exit 1
+ fi
 _description:
 Tests that the systems wireless hardware can connect to a router using WPA
 security and the 802.11ac protocol after the system has been suspended.
@@ -657,7 +745,15 @@ requires:
 environment.ROUTERS == 'multiple'
 user: root
 environ: OPEN_AC_SSID
-command: trap "rm -f /etc/NetworkManager/system-connections/$OPEN_AC_SSID" EXIT; create_connection wifi $OPEN_AC_SSID; gateway_ping_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+command:
+ trap "nmcli con delete id $OPEN_AC_SSID" EXIT
+ if create_connection wifi $OPEN_AC_SSID; then
+ INTERFACE=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+ iw dev $INTERFACE link
+ gateway_ping_test --interface=$INTERFACE
+ else
+ exit 1
+ fi
 _description:
 Tests that the systems wireless hardware can connect to a router using no
 security and the 802.11ac protocol after the system has been suspended.
@@ -737,7 +833,15 @@ requires:
 environment.ROUTERS == 'single'
 user: root
 environ: ROUTER_SSID ROUTER_PSK
-command: trap "nmcli con delete id $ROUTER_SSID" EXIT; create_connection wifi $ROUTER_SSID --security=wpa --key=$ROUTER_PSK && gateway_ping_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+command:
+ trap "nmcli con delete id $ROUTER_SSID" EXIT
+ if create_connection wifi $ROUTER_SSID --security=wpa --key=$ROUTER_PSK; then
+ INTERFACE=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+ iw dev $INTERFACE link
+ gateway_ping_test --interface=$INTERFACE
+ else
+ exit 1
+ fi
 _description:
 PURPOSE:
 Tests that the systems wireless hardware can connect to a router using WPA
@@ -760,7 +864,15 @@ requires:
 environment.ROUTERS == 'single'
 user: root
 environ: ROUTER_SSID
-command: trap "nmcli con delete id $ROUTER_SSID" EXIT; create_connection wifi $ROUTER_SSID && gateway_ping_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+command:
+ trap "nmcli con delete id $ROUTER_SSID" EXIT
+ if create_connection wifi $ROUTER_SSID; then
+ INTERFACE=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+ iw dev $INTERFACE link
+ gateway_ping_test --interface=$INTERFACE
+ else
+ exit 1
+ fi
 _description:
 PURPOSE:
 Tests that the systems wireless hardware can connect to a router using
@@ -783,7 +895,15 @@ requires:
 environment.ROUTERS == 'single'
 user: root
 environ: ROUTER_SSID ROUTER_PSK
-command: trap "nmcli con delete id $ROUTER_SSID" EXIT; create_connection wifi $ROUTER_SSID --security=wpa --key=$ROUTER_PSK && gateway_ping_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+command:
+ trap "nmcli con delete id $ROUTER_SSID" EXIT
+ if create_connection wifi $ROUTER_SSID --security=wpa --key=$ROUTER_PSK; then
+ INTERFACE=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+ iw dev $INTERFACE link
+ gateway_ping_test --interface=$INTERFACE
+ else
+ exit 1
+ fi
 _description:
 PURPOSE:
 Tests that the systems wireless hardware can connect to a router using WPA
@@ -806,7 +926,15 @@ requires:
 environment.ROUTERS == 'single'
 user: root
 environ: ROUTER_SSID
-command: trap "nmcli con delete id $ROUTER_SSID" EXIT; create_connection wifi $ROUTER_SSID && gateway_ping_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+command:
+ trap "nmcli con delete id $ROUTER_SSID" EXIT
+ if create_connection wifi $ROUTER_SSID; then
+ INTERFACE=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+ iw dev $INTERFACE link
+ gateway_ping_test --interface=$INTERFACE
+ else
+ exit 1
+ fi
 _description:
 PURPOSE:
 Tests that the systems wireless hardware can connect to a router using
@@ -829,7 +957,15 @@ requires:
 environment.ROUTERS == 'single'
 user: root
 environ: ROUTER_SSID ROUTER_PSK
-command: trap "nmcli con delete id $ROUTER_SSID" EXIT; create_connection wifi $ROUTER_SSID --security=wpa --key=$ROUTER_PSK && gateway_ping_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+command:
+ trap "nmcli con delete id $ROUTER_SSID" EXIT
+ if create_connection wifi $ROUTER_SSID --security=wpa --key=$ROUTER_PSK; then
+ INTERFACE=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+ iw dev $INTERFACE link
+ gateway_ping_test --interface=$INTERFACE
+ else
+ exit 1
+ fi
 _description:
 PURPOSE:
 Tests that the systems wireless hardware can connect to a router using WPA
@@ -852,7 +988,15 @@ requires:
 environment.ROUTERS == 'single'
 user: root
 environ: ROUTER_SSID
-command: trap "nmcli con delete id $ROUTER_SSID" EXIT; create_connection wifi $ROUTER_SSID && gateway_ping_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+command:
+ trap "nmcli con delete id $ROUTER_SSID" EXIT
+ if create_connection wifi $ROUTER_SSID; then
+ INTERFACE=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+ iw dev $INTERFACE link
+ gateway_ping_test --interface=$INTERFACE
+ else
+ exit 1
+ fi
 _description:
 PURPOSE:
 Tests that the systems wireless hardware can connect to a router using