diff options
-rw-r--r-- | units/dock/jobs.pxu | 18 | ||||
-rw-r--r-- | units/ethernet/jobs.pxu | 4 | ||||
-rw-r--r-- | units/networking/jobs.pxu | 4 | ||||
-rw-r--r-- | units/suspend/suspend.pxu | 16 | ||||
-rw-r--r-- | units/wireless/jobs.pxu | 12 |
5 files changed, 27 insertions, 27 deletions
diff --git a/units/dock/jobs.pxu b/units/dock/jobs.pxu index 9570b38..de2a3d5 100644 --- a/units/dock/jobs.pxu +++ b/units/dock/jobs.pxu @@ -553,7 +553,7 @@ id: dock/networking-gateway-ping plugin: user-interact-verify category_id: dock-network depends: dock/cold-plug ethernet/detect -command: gateway_ping_test +command: gateway_ping_test.py estimated_duration: 10.00 _summary: Ping test using dock's Ethernet connectivity _purpose: @@ -1209,7 +1209,7 @@ depends: ethernet/detect estimated_duration: 1.2 _summary: Network status before suspend _description: Record the current network before suspending. -command: set -o pipefail; gateway_ping_test | tee "$PLAINBOX_SESSION_SHARE"/network_before_suspend.txt +command: set -o pipefail; gateway_ping_test.py | tee "$PLAINBOX_SESSION_SHARE"/network_before_suspend.txt plugin: shell id: dock/audio-before-suspend @@ -1228,7 +1228,7 @@ id: dock/networking-gateway-ping-after-suspend category_id: dock-network plugin: shell depends: suspend/suspend_advanced ethernet/detect -command: gateway_ping_test +command: gateway_ping_test.py estimated_duration: 2.00 _summary: Network gateway ping after suspend _description: Tests whether the system has a working Internet connection. @@ -1544,7 +1544,7 @@ command: if create_connection.py 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" + gateway_ping_test.py --interface="$INTERFACE" else exit 1 fi @@ -1569,7 +1569,7 @@ command: if create_connection.py wifi "$OPEN_BG_SSID"; then INTERFACE=$(nmcli dev status | awk '/802-11-wireless/ {print $1}') iw dev "$INTERFACE" link - gateway_ping_test --interface="$INTERFACE" + gateway_ping_test.py --interface="$INTERFACE" else exit 1 fi @@ -1594,7 +1594,7 @@ command: if create_connection.py 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" + gateway_ping_test.py --interface="$INTERFACE" else exit 1 fi @@ -1619,7 +1619,7 @@ command: if create_connection.py wifi "$OPEN_N_SSID"; then INTERFACE=$(nmcli dev status | awk '/802-11-wireless/ {print $1}') iw dev "$INTERFACE" link - gateway_ping_test --interface="$INTERFACE" + gateway_ping_test.py --interface="$INTERFACE" else exit 1 fi @@ -1645,7 +1645,7 @@ command: if create_connection.py 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" + gateway_ping_test.py --interface="$INTERFACE" else exit 1 fi @@ -1671,7 +1671,7 @@ command: if create_connection.py wifi "$OPEN_AC_SSID"; then INTERFACE=$(nmcli dev status | awk '/802-11-wireless/ {print $1}') iw dev "$INTERFACE" link - gateway_ping_test --interface="$INTERFACE" + gateway_ping_test.py --interface="$INTERFACE" else exit 1 fi diff --git a/units/ethernet/jobs.pxu b/units/ethernet/jobs.pxu index 6ef3043..8a4fddc 100644 --- a/units/ethernet/jobs.pxu +++ b/units/ethernet/jobs.pxu @@ -187,7 +187,7 @@ _summary: Can ping another machine over Ethernet port {interface} _description: Check Ethernet works by pinging another machine plugin: shell command: - gateway_ping_test -v --interface {interface} + gateway_ping_test.py -v --interface {interface} category_id: com.canonical.plainbox::ethernet estimated_duration: 4.0 flags: preserve-locale also-after-suspend @@ -334,7 +334,7 @@ command: exit 1 fi echo "Interface up" - gateway_ping_test -v --interface {interface} + gateway_ping_test.py -v --interface {interface} PING_TEST=$? if [ $PING_TEST -ne 0 ]; then echo "Ping test failed" diff --git a/units/networking/jobs.pxu b/units/networking/jobs.pxu index bd886fe..2e481b9 100644 --- a/units/networking/jobs.pxu +++ b/units/networking/jobs.pxu @@ -2,7 +2,7 @@ plugin: shell category_id: com.canonical.plainbox::networking id: networking/gateway_ping depends: ethernet/detect -command: gateway_ping_test +command: gateway_ping_test.py estimated_duration: 2.000 _description: Tests whether the system has a working Internet connection. @@ -45,7 +45,7 @@ _description: plugin: shell category_id: com.canonical.plainbox::networking id: networking/ping -command: gateway_ping_test "$CHECKBOX_SERVER" +command: gateway_ping_test.py "$CHECKBOX_SERVER" _description: Automated test case to verify availability of some system on the network using ICMP ECHO packets. diff --git a/units/suspend/suspend.pxu b/units/suspend/suspend.pxu index eacc827..a71c85a 100644 --- a/units/suspend/suspend.pxu +++ b/units/suspend/suspend.pxu @@ -4,7 +4,7 @@ id: suspend/network_before_suspend depends: ethernet/detect estimated_duration: 1.2 _summary: Record the current network before suspending. -command: set -o pipefail; gateway_ping_test | tee "$PLAINBOX_SESSION_SHARE"/network_before_suspend.txt +command: set -o pipefail; gateway_ping_test.py | tee "$PLAINBOX_SESSION_SHARE"/network_before_suspend.txt plugin: shell category_id: com.canonical.plainbox::suspend @@ -407,7 +407,7 @@ id: suspend/network_after_suspend estimated_duration: 20.0 depends: suspend/suspend_advanced suspend/network_before_suspend _description: Test the network after resuming. -command: network_wait.py; gateway_ping_test | diff "$PLAINBOX_SESSION_SHARE"/network_before_suspend.txt - +command: network_wait.py; gateway_ping_test.py | diff "$PLAINBOX_SESSION_SHARE"/network_before_suspend.txt - plugin: shell category_id: com.canonical.plainbox::suspend @@ -692,7 +692,7 @@ command: connect_wireless.sh # lp:1471663 INTERFACE=$(nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}') iw dev "$INTERFACE" link - gateway_ping_test --interface="$INTERFACE" + gateway_ping_test.py --interface="$INTERFACE" STATUS=$? # We reconnect the Ethernet connection if any (lp:1471663) WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)") @@ -733,7 +733,7 @@ command: connect_wireless.sh # lp:1471663 INTERFACE=$(nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}') iw dev "$INTERFACE" link - gateway_ping_test --interface="$INTERFACE" + gateway_ping_test.py --interface="$INTERFACE" STATUS=$? # We reconnect the Ethernet connection if any (lp:1471663) WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)") @@ -774,7 +774,7 @@ command: connect_wireless.sh # lp:1471663 INTERFACE=$(nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}') iw dev "$INTERFACE" link - gateway_ping_test --interface="$INTERFACE" + gateway_ping_test.py --interface="$INTERFACE" STATUS=$? # We reconnect the Ethernet connection if any (lp:1471663) WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)") @@ -815,7 +815,7 @@ command: connect_wireless.sh # lp:1471663 INTERFACE=$(nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}') iw dev "$INTERFACE" link - gateway_ping_test --interface="$INTERFACE" + gateway_ping_test.py --interface="$INTERFACE" STATUS=$? # We reconnect the Ethernet connection if any (lp:1471663) WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)") @@ -856,7 +856,7 @@ command: connect_wireless.sh # lp:1471663 INTERFACE=$(nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}') iw dev "$INTERFACE" link - gateway_ping_test --interface="$INTERFACE" + gateway_ping_test.py --interface="$INTERFACE" STATUS=$? # We reconnect the Ethernet connection if any (lp:1471663) WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)") @@ -897,7 +897,7 @@ command: connect_wireless.sh # lp:1471663 INTERFACE=$(nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}') iw dev "$INTERFACE" link - gateway_ping_test --interface="$INTERFACE" + gateway_ping_test.py --interface="$INTERFACE" STATUS=$? # We reconnect the Ethernet connection if any (lp:1471663) WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)") diff --git a/units/wireless/jobs.pxu b/units/wireless/jobs.pxu index 6d8b27b..b4f2d55 100644 --- a/units/wireless/jobs.pxu +++ b/units/wireless/jobs.pxu @@ -227,7 +227,7 @@ command: connect_wireless.sh # lp:1471663 INTERFACE=$(nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}') iw dev "$INTERFACE" link - gateway_ping_test --interface="$INTERFACE" + gateway_ping_test.py --interface="$INTERFACE" STATUS=$? # We reconnect the Ethernet connection if any (lp:1471663) WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)") @@ -267,7 +267,7 @@ command: connect_wireless.sh # lp:1471663 INTERFACE=$(nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}') iw dev "$INTERFACE" link - gateway_ping_test --interface="$INTERFACE" + gateway_ping_test.py --interface="$INTERFACE" STATUS=$? # We reconnect the Ethernet connection if any (lp:1471663) WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)") @@ -308,7 +308,7 @@ command: connect_wireless.sh # lp:1471663 INTERFACE=$(nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}') iw dev "$INTERFACE" link - gateway_ping_test --interface="$INTERFACE" + gateway_ping_test.py --interface="$INTERFACE" STATUS=$? # We reconnect the Ethernet connection if any (lp:1471663) WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)") @@ -349,7 +349,7 @@ command: connect_wireless.sh # lp:1471663 INTERFACE=$(nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}') iw dev "$INTERFACE" link - gateway_ping_test --interface="$INTERFACE" + gateway_ping_test.py --interface="$INTERFACE" STATUS=$? # We reconnect the Ethernet connection if any (lp:1471663) WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)") @@ -390,7 +390,7 @@ command: connect_wireless.sh # lp:1471663 INTERFACE=$(nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}') iw dev "$INTERFACE" link - gateway_ping_test --interface="$INTERFACE" + gateway_ping_test.py --interface="$INTERFACE" STATUS=$? # We reconnect the Ethernet connection if any (lp:1471663) WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)") @@ -431,7 +431,7 @@ command: connect_wireless.sh # lp:1471663 INTERFACE=$(nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}') iw dev "$INTERFACE" link - gateway_ping_test --interface="$INTERFACE" + gateway_ping_test.py --interface="$INTERFACE" STATUS=$? # We reconnect the Ethernet connection if any (lp:1471663) WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)") |