Import plainbox-provider-checkbox_0.42.0~rc1.orig.tar.gzupstream-0.42.0_rc1patched-0.42.0_rc1-1

2 files changed, 37 insertions, 430 deletions

diff --git a/units/suspend/suspend-graphics.pxu b/units/suspend/suspend-graphics.pxu
index c85d147..e05153a 100644
--- a/units/suspend/suspend-graphics.pxu
+++ b/units/suspend/suspend-graphics.pxu
@@ -102,7 +102,7 @@ plugin: attachment
 category_id: com.canonical.plainbox::suspend
 id: suspend/{index}_xrandr_screens_after_suspend.tar.gz_xenial
 depends: suspend/{index}_cycle_resolutions_after_suspend_{product_slug}_xenial
-command: [ -f $PLAINBOX_SESSION_SHARE/{index}_xrandr_screens_after_suspend.tgz ] && base64 $PLAINBOX_SESSION_SHARE/{index}_xrandr_screens_after_suspend.tgz
+command: [ -f $PLAINBOX_SESSION_SHARE/{index}_xrandr_screens_after_suspend.tgz ] && cat $PLAINBOX_SESSION_SHARE/{index}_xrandr_screens_after_suspend.tgz
 _description: This attaches screenshots from the suspend/cycle_resolutions_after_suspend test to the results submission.
 
 unit: template
@@ -199,3 +199,26 @@ estimated_duration: 1.2
 command: [ -e $PLAINBOX_SESSION_SHARE/{index}_suspend_single_times.log ] && sleep_time_check $PLAINBOX_SESSION_SHARE/{index}_suspend_single_times.log
 _description: Checks the sleep times to ensure that a machine suspends and resumes within a given threshold
 
+unit: template
+template-resource: graphics_card
+template-filter: graphics_card.prime_gpu_offload == 'Off'
+id: power-management/{index}_suspend_30_times_on_{product_slug}
+plugin: shell
+category_id: com.canonical.plainbox::stress
+estimated_duration: 5400.0
+depends:
+ power-management/rtc
+ suspend/suspend_advanced
+ graphics/{index}_auto_switch_card_{product_slug}
+flags: noreturn autorestart
+user: root
+command:
+ if type -P fwts >/dev/null; then
+ echo "Calling fwts"
+ set -o pipefail; checkbox-support-fwts_test -f none -l $PLAINBOX_SESSION_SHARE/{index}_suspend_single -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee $PLAINBOX_SESSION_SHARE/{index}_suspend_single_times.log
+ else
+ echo "Calling sleep_test"
+ set -o pipefail; sleep_test -p | tee $PLAINBOX_SESSION_SHARE/{index}_suspend_single_times.log
+ fi
+_purpose:
+ Suspend SUT 30 times while using {product_slug} graphics card
diff --git a/units/suspend/suspend.pxu b/units/suspend/suspend.pxu
index 136adfb..6704a2f 100644
--- a/units/suspend/suspend.pxu
+++ b/units/suspend/suspend.pxu
@@ -49,17 +49,6 @@ _description:
 Dumps memory info to a file for comparison after suspend test has been run
 command: meminfo_resource > $PLAINBOX_SESSION_SHARE/meminfo_before_suspend
 
-plugin: shell
-category_id: com.canonical.plainbox::suspend
-id: suspend/wireless_before_suspend
-depends: wireless/wireless_connection
-requires: device.category == 'WIRELESS'
-command: nmcli -t -f UUID con status > $PLAINBOX_SESSION_SHARE/connections && connect_wireless && gateway_ping_test --interface=`(nmcli dev list 2>/dev/null || nmcli dev show) | grep -B 1 -e 'wireless' -e 'wifi' | grep GENERAL.DEVICE | awk '{print $2}'` && for con in `cat $PLAINBOX_SESSION_SHARE/connections`; do nmcli con up uuid "$con"; done
-estimated_duration: 20.0
-_description:
- This test disconnects all connections and then connects to the wireless
- interface. It then checks the connection to confirm it's working as expected.
-
 unit: template
 template-resource: device
 template-filter: device.category == 'NETWORK'
@@ -76,22 +65,6 @@ command: network -i {interface} -t iperf
 _description:
 This test executes iperf connection performance/stability against device {__index__} ({interface}) before suspend.
 
-unit: template
-template-resource: device
-template-filter: device.category == 'WIRELESS'
-plugin: shell
-category_id: com.canonical.plainbox::suspend
-id: suspend/iperf_before_suspend_wifi_auto_device{__index__}_{interface}
-depends: wireless/wireless_connection
-estimated_duration: 20.0
-requires:
- package.name == 'iperf'
-user: root
-environ: TEST_TARGET_FTP TEST_TARGET_IPERF TEST_USER TEST_PASS
-command: network -i {interface} -t iperf
-_description:
- This test executes iperf connection performance/stability against device {__index__} ({interface}) before suspend.
-
 plugin: shell
 category_id: com.canonical.plainbox::suspend
 id: suspend/iperf_before_suspend_mobilebroadband_gsm_auto
@@ -99,7 +72,7 @@ depends: mobilebroadband/gsm_connection
 estimated_duration: 20.0
 user: root
 environ: TEST_TARGET_FTP TEST_TARGET_IPERF TEST_USER TEST_PASS
-command: 
+command:
 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`
 [ -z $INTERFACE ] && exit 1
 network test -i $INTERFACE -t iperf
@@ -113,7 +86,7 @@ depends: mobilebroadband/cdma_connection
 estimated_duration: 20.0
 user: root
 environ: TEST_TARGET_FTP TEST_TARGET_IPERF TEST_USER TEST_PASS
-command: 
+command:
 INTERFACE=`(nmcli -t -f GENERAL -m tabular dev list 2>/dev/null || nmcli -t -f GENERAL -m tabular dev show) |grep cdma |cut -d ":" -f 13`
 [ -z $INTERFACE ] && exit 1
 network test -i $INTERFACE -t iperf
@@ -327,7 +300,7 @@ plugin: attachment
 category_id: com.canonical.plainbox::suspend
 id: suspend/suspend-single-log-attach
 depends: suspend/suspend_advanced_auto
-command: [ -e $PLAINBOX_SESSION_SHARE/suspend_single.log ] && xz -c $PLAINBOX_SESSION_SHARE/suspend_single.log | base64
+command: [ -e $PLAINBOX_SESSION_SHARE/suspend_single.log ] && cat $PLAINBOX_SESSION_SHARE/suspend_single.log
 _description:
 Attaches the log from the single suspend/resume test to the results
 
@@ -338,7 +311,7 @@ plugin: attachment
 category_id: com.canonical.plainbox::suspend
 id: suspend/{index}_suspend-single-log-attach_{product_slug}
 depends: suspend/{index}_suspend_after_switch_to_card_{product_slug}
-command: [ -e $PLAINBOX_SESSION_SHARE/{index}_suspend_single.log ] && xz -c $PLAINBOX_SESSION_SHARE/{index}_suspend_single.log | base64
+command: [ -e $PLAINBOX_SESSION_SHARE/{index}_suspend_single.log ] && cat $PLAINBOX_SESSION_SHARE/{index}_suspend_single.log
 _description:
 Attaches the log from the single suspend/resume test to the results
 
@@ -359,7 +332,7 @@ plugin: attachment
 category_id: com.canonical.plainbox::suspend
 id: suspend/{index}_hybrid-sleep-single-log-attach_{product_slug}
 depends: suspend/{index}_hybrid_sleep_{product_slug}
-command: [ -e $PLAINBOX_SESSION_SHARE/{index}_hybrid_sleep_single.log ] && xz -c $PLAINBOX_SESSION_SHARE/{index}_hybrid_sleep_single.log | base64
+command: [ -e $PLAINBOX_SESSION_SHARE/{index}_hybrid_sleep_single.log ] && cat $PLAINBOX_SESSION_SHARE/{index}_hybrid_sleep_single.log
 _description:
 Attaches the log from the single hybrid sleep/resume test to the results
 
@@ -630,395 +603,6 @@ _description:
 VERIFICATION:
 Does the display work normally after resuming from suspend using the {vendor} {product} graphics card?
 
-plugin: shell
-category_id: com.canonical.plainbox::suspend
-id: suspend/wireless_after_suspend
-depends: suspend/suspend_advanced suspend/wireless_before_suspend
-requires:
- device.category == 'WIRELESS'
-command: connect_wireless && gateway_ping_test --interface=`(nmcli dev list 2>/dev/null || nmcli dev show) | grep -B 1 -e wireless -e wifi | grep GENERAL.DEVICE | awk '{print $2}'` && for con in `cat $PLAINBOX_SESSION_SHARE/connections`; do nmcli con up uuid "$con"; done
-estimated_duration: 20.0
-_description:
- This test checks that the wireless interface is working after suspending the system. It
- disconnects all interfaces and then connects to the wireless interface and checks that the
- connection is working as expected.
-
-plugin: shell
-category_id: com.canonical.plainbox::suspend
-id: suspend/wireless_connection_after_suspend_wpa_bg
-depends: suspend/suspend_advanced
-estimated_duration: 20.0
-requires:
- device.category == 'WIRELESS'
- environment.ROUTERS == 'multiple'
-user: root
-environ: WPA_BG_SSID WPA_BG_PSK
-command:
- trap "nmcli con delete id $WPA_BG_SSID" EXIT
- if create_connection wifi $WPA_BG_SSID --security=wpa --key=$WPA_BG_PSK; then
- connect_wireless # lp:1471663
- INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
- iw dev $INTERFACE link
- gateway_ping_test --interface=$INTERFACE
- STATUS=$?
- # We reconnect the Ethernet connection if any (lp:1471663)
- WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
- if [[ ! -z $WIRED ]]; then
- nmcli c up uuid $WIRED
- fi
- exit $STATUS
- 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.
-
-plugin: shell
-category_id: com.canonical.plainbox::suspend
-id: suspend/wireless_connection_after_suspend_open_bg
-depends: suspend/suspend_advanced
-estimated_duration: 1.2
-requires:
- device.category == 'WIRELESS'
- environment.ROUTERS == 'multiple'
-user: root
-environ: OPEN_BG_SSID
-command:
- trap "nmcli con delete id $OPEN_BG_SSID" EXIT
- if create_connection wifi $OPEN_BG_SSID; then
- connect_wireless # lp:1471663
- INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
- iw dev $INTERFACE link
- gateway_ping_test --interface=$INTERFACE
- STATUS=$?
- # We reconnect the Ethernet connection if any (lp:1471663)
- WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
- if [[ ! -z $WIRED ]]; then
- nmcli c up uuid $WIRED
- fi
- exit $STATUS
- 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.
-
-plugin: shell
-category_id: com.canonical.plainbox::suspend
-id: suspend/wireless_connection_after_suspend_wpa_n
-depends: suspend/suspend_advanced
-estimated_duration: 1.2
-requires:
- device.category == 'WIRELESS'
- environment.ROUTERS == 'multiple'
-user: root
-environ: WPA_N_SSID WPA_N_PSK
-command:
- trap "nmcli con delete id $WPA_N_SSID" EXIT
- if create_connection wifi $WPA_N_SSID --security=wpa --key=$WPA_N_PSK; then
- connect_wireless # lp:1471663
- INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
- iw dev $INTERFACE link
- gateway_ping_test --interface=$INTERFACE
- STATUS=$?
- # We reconnect the Ethernet connection if any (lp:1471663)
- WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
- if [[ ! -z $WIRED ]]; then
- nmcli c up uuid $WIRED
- fi
- exit $STATUS
- 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.
-
-plugin: shell
-category_id: com.canonical.plainbox::suspend
-id: suspend/wireless_connection_after_suspend_open_n
-depends: suspend/suspend_advanced
-estimated_duration: 1.2
-requires:
- device.category == 'WIRELESS'
- environment.ROUTERS == 'multiple'
-user: root
-environ: OPEN_N_SSID
-command:
- trap "nmcli con delete id $OPEN_N_SSID" EXIT
- if create_connection wifi $OPEN_N_SSID; then
- connect_wireless # lp:1471663
- INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
- iw dev $INTERFACE link
- gateway_ping_test --interface=$INTERFACE
- STATUS=$?
- # We reconnect the Ethernet connection if any (lp:1471663)
- WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
- if [[ ! -z $WIRED ]]; then
- nmcli c up uuid $WIRED
- fi
- exit $STATUS
- 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.
-
-plugin: shell
-category_id: com.canonical.plainbox::suspend
-id: suspend/wireless_connection_after_suspend_wpa_ac
-depends: suspend/suspend_advanced
-estimated_duration: 1.2
-requires:
- device.category == 'WIRELESS'
- environment.ROUTERS == 'multiple'
- IEEE_80211.ac == 'supported'
-user: root
-environ: WPA_AC_SSID WPA_AC_PSK
-command:
- trap "nmcli con delete id $WPA_AC_SSID" EXIT
- if create_connection wifi $WPA_AC_SSID --security=wpa --key=$WPA_AC_PSK; then
- connect_wireless # lp:1471663
- INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
- iw dev $INTERFACE link
- gateway_ping_test --interface=$INTERFACE
- STATUS=$?
- # We reconnect the Ethernet connection if any (lp:1471663)
- WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
- if [[ ! -z $WIRED ]]; then
- nmcli c up uuid $WIRED
- fi
- exit $STATUS
- 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.
-
-plugin: shell
-category_id: com.canonical.plainbox::suspend
-id: suspend/wireless_connection_after_suspend_open_ac
-depends: suspend/suspend_advanced
-estimated_duration: 1.2
-requires:
- device.category == 'WIRELESS'
- environment.ROUTERS == 'multiple'
- IEEE_80211.ac == 'supported'
-user: root
-environ: OPEN_AC_SSID
-command:
- trap "nmcli con delete id $OPEN_AC_SSID" EXIT
- if create_connection wifi $OPEN_AC_SSID; then
- connect_wireless # lp:1471663
- INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
- iw dev $INTERFACE link
- gateway_ping_test --interface=$INTERFACE
- STATUS=$?
- # We reconnect the Ethernet connection if any (lp:1471663)
- WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
- if [[ ! -z $WIRED ]]; then
- nmcli c up uuid $WIRED
- fi
- exit $STATUS
- 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.
-
-plugin: shell
-category_id: com.canonical.plainbox::suspend
-id: suspend/wireless_connection_after_suspend_wpa_bg_auto
-depends: suspend/suspend_advanced_auto
-estimated_duration: 1.2
-requires:
- device.category == 'WIRELESS'
- environment.ROUTERS == 'multiple'
-user: root
-environ: WPA_BG_SSID WPA_BG_PSK
-command:
- trap "nmcli con delete id $WPA_BG_SSID" EXIT
- if create_connection wifi $WPA_BG_SSID --security=wpa --key=$WPA_BG_PSK; then
- connect_wireless # lp:1471663
- INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
- iw dev $INTERFACE link
- gateway_ping_test --interface=$INTERFACE
- STATUS=$?
- # We reconnect the Ethernet connection if any (lp:1471663)
- WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
- if [[ ! -z $WIRED ]]; then
- nmcli c up uuid $WIRED
- fi
- exit $STATUS
- 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.
-
-plugin: shell
-category_id: com.canonical.plainbox::suspend
-id: suspend/wireless_connection_after_suspend_open_bg_auto
-depends: suspend/suspend_advanced_auto
-estimated_duration: 1.2
-requires:
- device.category == 'WIRELESS'
- environment.ROUTERS == 'multiple'
-user: root
-environ: OPEN_BG_SSID
-command:
- trap "nmcli con delete id $OPEN_BG_SSID" EXIT
- if create_connection wifi $OPEN_BG_SSID; then
- connect_wireless # lp:1471663
- INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
- iw dev $INTERFACE link
- gateway_ping_test --interface=$INTERFACE
- STATUS=$?
- # We reconnect the Ethernet connection if any (lp:1471663)
- WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
- if [[ ! -z $WIRED ]]; then
- nmcli c up uuid $WIRED
- fi
- exit $STATUS
- 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.
-
-plugin: shell
-category_id: com.canonical.plainbox::suspend
-id: suspend/wireless_connection_after_suspend_wpa_n_auto
-depends: suspend/suspend_advanced_auto
-estimated_duration: 1.2
-requires:
- device.category == 'WIRELESS'
- environment.ROUTERS == 'multiple'
-user: root
-environ: WPA_N_SSID WPA_N_PSK
-command:
- trap "nmcli con delete id $WPA_N_SSID" EXIT
- if create_connection wifi $WPA_N_SSID --security=wpa --key=$WPA_N_PSK; then
- connect_wireless # lp:1471663
- INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
- iw dev $INTERFACE link
- gateway_ping_test --interface=$INTERFACE
- STATUS=$?
- # We reconnect the Ethernet connection if any (lp:1471663)
- WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
- if [[ ! -z $WIRED ]]; then
- nmcli c up uuid $WIRED
- fi
- exit $STATUS
- 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.
-
-plugin: shell
-category_id: com.canonical.plainbox::suspend
-id: suspend/wireless_connection_after_suspend_open_n_auto
-depends: suspend/suspend_advanced_auto
-estimated_duration: 1.2
-requires:
- device.category == 'WIRELESS'
- environment.ROUTERS == 'multiple'
-user: root
-environ: OPEN_N_SSID
-command:
- trap "nmcli con delete id $OPEN_N_SSID" EXIT
- if create_connection wifi $OPEN_N_SSID; then
- connect_wireless # lp:1471663
- INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
- iw dev $INTERFACE link
- gateway_ping_test --interface=$INTERFACE
- STATUS=$?
- # We reconnect the Ethernet connection if any (lp:1471663)
- WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
- if [[ ! -z $WIRED ]]; then
- nmcli c up uuid $WIRED
- fi
- exit $STATUS
- 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.
-
-plugin: shell
-category_id: com.canonical.plainbox::suspend
-id: suspend/wireless_connection_after_suspend_wpa_ac_auto
-depends: suspend/suspend_advanced_auto
-estimated_duration: 1.2
-requires:
- device.category == 'WIRELESS'
- environment.ROUTERS == 'multiple'
- IEEE_80211.ac == 'supported'
-user: root
-environ: WPA_AC_SSID WPA_AC_PSK
-command:
- trap "nmcli con delete id $WPA_AC_SSID" EXIT
- if create_connection wifi $WPA_AC_SSID --security=wpa --key=$WPA_AC_PSK; then
- connect_wireless # lp:1471663
- INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
- iw dev $INTERFACE link
- gateway_ping_test --interface=$INTERFACE
- STATUS=$?
- # We reconnect the Ethernet connection if any (lp:1471663)
- WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
- if [[ ! -z $WIRED ]]; then
- nmcli c up uuid $WIRED
- fi
- exit $STATUS
- 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.
-
-plugin: shell
-category_id: com.canonical.plainbox::suspend
-id: suspend/wireless_connection_after_suspend_open_ac_auto
-depends: suspend/suspend_advanced_auto
-estimated_duration: 1.2
-requires:
- device.category == 'WIRELESS'
- environment.ROUTERS == 'multiple'
- IEEE_80211.ac == 'supported'
-user: root
-environ: OPEN_AC_SSID
-command:
- trap "nmcli con delete id $OPEN_AC_SSID" EXIT
- if create_connection wifi $OPEN_AC_SSID; then
- connect_wireless # lp:1471663
- INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
- iw dev $INTERFACE link
- gateway_ping_test --interface=$INTERFACE
- STATUS=$?
- # We reconnect the Ethernet connection if any (lp:1471663)
- WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
- if [[ ! -z $WIRED ]]; then
- nmcli c up uuid $WIRED
- fi
- exit $STATUS
- 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.
-
 unit: template
 template-resource: device
 template-filter: device.category == 'NETWORK'
@@ -1058,7 +642,7 @@ depends: suspend/suspend_advanced_auto
 estimated_duration: 20.0
 user: root
 environ: TEST_TARGET_FTP TEST_TARGET_IPERF TEST_USER TEST_PASS
-command: 
+command:
 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`
 [ -z $INTERFACE ] && exit 1
 network test -i $INTERFACE -t iperf
@@ -1072,7 +656,7 @@ depends: suspend/suspend_advanced_auto
 estimated_duration: 20.0
 user: root
 environ: TEST_TARGET_FTP TEST_TARGET_IPERF TEST_USER TEST_PASS
-command: 
+command:
 INTERFACE=`(nmcli -t -f GENERAL -m tabular dev list 2>/dev/null || nmcli -t -f GENERAL -m tabular dev show) |grep cdma |cut -d ":" -f 13`
 [ -z $INTERFACE ] && exit 1
 network test -i $INTERFACE -t iperf
@@ -1567,7 +1151,7 @@ plugin: attachment
 category_id: com.canonical.plainbox::suspend
 id: suspend/xrandr_screens_after_suspend.tar.gz
 depends: suspend/cycle_resolutions_after_suspend
-command: [ -f $PLAINBOX_SESSION_SHARE/xrandr_screens_after_suspend.tgz ] && base64 $PLAINBOX_SESSION_SHARE/xrandr_screens_after_suspend.tgz
+command: [ -f $PLAINBOX_SESSION_SHARE/xrandr_screens_after_suspend.tgz ] && cat $PLAINBOX_SESSION_SHARE/xrandr_screens_after_suspend.tgz
 _description: This attaches screenshots from the suspend/cycle_resolutions_after_suspend test to the results submission.
 
 unit: template
@@ -1577,7 +1161,7 @@ plugin: attachment
 category_id: com.canonical.plainbox::suspend
 id: suspend/{index}_xrandr_screens_after_suspend.tar.gz
 depends: suspend/{index}_cycle_resolutions_after_suspend_{product_slug}
-command: [ -f $PLAINBOX_SESSION_SHARE/{index}_xrandr_screens_after_suspend.tgz ] && base64 $PLAINBOX_SESSION_SHARE/{index}_xrandr_screens_after_suspend.tgz
+command: [ -f $PLAINBOX_SESSION_SHARE/{index}_xrandr_screens_after_suspend.tgz ] && cat $PLAINBOX_SESSION_SHARE/{index}_xrandr_screens_after_suspend.tgz
 _description: This attaches screenshots from the suspend/cycle_resolutions_after_suspend test to the results submission.
 
 plugin: shell
@@ -1617,7 +1201,7 @@ _description:
 plugin: attachment
 category_id: com.canonical.plainbox::suspend
 id: suspend/suspend-auto-single-log-attach
-command: [ -e $PLAINBOX_SESSION_SHARE/suspend_auto_single_log ] && xz -c $PLAINBOX_SESSION_SHARE/suspend_auto_single_log | base64
+command: [ -e $PLAINBOX_SESSION_SHARE/suspend_auto_single_log ] && cat $PLAINBOX_SESSION_SHARE/suspend_auto_single_log
 _description:
 Attaches the log from the single suspend/resume test to the results
 
@@ -1640,7 +1224,7 @@ plugin: attachment
 category_id: com.canonical.plainbox::suspend
 id: screenshot_after_suspend.jpg
 depends: suspend/screenshot_after_suspend
-command: base64 ${PLAINBOX_SESSION_SHARE}/screenshot_after_suspend.jpg
+command: cat ${PLAINBOX_SESSION_SHARE}/screenshot_after_suspend.jpg
 _description: Attaches the screenshot captured in graphics/screenshot.
 
 plugin: shell
@@ -1651,6 +1235,7 @@ requires:
 package.name == 'wmctrl'
 package.name == 'mesa-utils'
 package.name == 'firefox'
+ package.name == 'unity'
 depends: suspend/suspend_advanced_auto
 command: gpu_test
 _description:
@@ -2724,6 +2309,5 @@ plugin: attachment
 category_id: com.canonical.plainbox::suspend
 estimated_duration: 0.5
 command:
- [ -e ${PLAINBOX_SESSION_SHARE}/fwts_oops_results_after_s3.log ] && xz -c ${PLAINBOX_SESSION_SHARE}/fwts_oops_results_after_s3.log | base64
+ [ -e ${PLAINBOX_SESSION_SHARE}/fwts_oops_results_after_s3.log ] && xz -c ${PLAINBOX_SESSION_SHARE}/fwts_oops_results_after_s3.log
 _description: Attaches the FWTS oops results log to the submission after suspend
-