summaryrefslogtreecommitdiff
diff options
authorSylvain Pineau <sylvain.pineau@canonical.com>2020-07-12 18:39:19 +0200
committerSylvain Pineau <sylvain.pineau@canonical.com>2020-07-12 18:39:19 +0200
commite7cacbbd4bb447fb57fd953248f962e535d5393e (patch)
treec63c664af957e46ccfa5f45fa56b7ee5a32a7426
parent32805fe0ed719cd7f9b722e8dab5b5a17310cbd2 (diff)
bin:ansi_parser -> ansi_parser.py
-rwxr-xr-xbin/ansi_parser.py (renamed from bin/ansi_parser)0
-rwxr-xr-xbin/bluetooth_transfer_stress4
-rw-r--r--units/graphics/jobs.pxu6
-rw-r--r--units/graphics/legacy.pxu6
-rw-r--r--units/info/jobs.pxu4
-rw-r--r--units/optical/jobs.pxu10
-rw-r--r--units/suspend/suspend-graphics.pxu2
-rw-r--r--units/suspend/suspend.pxu24
8 files changed, 28 insertions, 28 deletions
diff --git a/bin/ansi_parser b/bin/ansi_parser.py
index c7cf26c..c7cf26c 100755
--- a/bin/ansi_parser
+++ b/bin/ansi_parser.py
diff --git a/bin/bluetooth_transfer_stress b/bin/bluetooth_transfer_stress
index 2add0b1..36e4de7 100755
--- a/bin/bluetooth_transfer_stress
+++ b/bin/bluetooth_transfer_stress
@@ -35,10 +35,10 @@ dd if=/dev/urandom of=$ORIGIN count=$SIZEKB bs=1024
ORIGIN_SUM=$(sha256sum $ORIGIN | cut -f 1 -d ' ')
set -o pipefail
echo "Sending file using Bluetooth"
-time obexftp -v -b $BTDEVADDR -o $REMOTE --put $ORIGIN 2>&1 | ansi_parser
+time obexftp -v -b $BTDEVADDR -o $REMOTE --put $ORIGIN 2>&1 | ansi_parser.py
sleep 5
echo "Receiving file using Bluetooth"
-time obexftp -v -b $BTDEVADDR -o $DESTINATION --get $REMOTE 2>&1 | ansi_parser
+time obexftp -v -b $BTDEVADDR -o $DESTINATION --get $REMOTE 2>&1 | ansi_parser.py
# Now checksum destination and compare
DESTINATION_SUM=$(sha256sum $DESTINATION | cut -f 1 -d ' ')
# Clean up before reporting
diff --git a/units/graphics/jobs.pxu b/units/graphics/jobs.pxu
index fba1f7e..fdb2897 100644
--- a/units/graphics/jobs.pxu
+++ b/units/graphics/jobs.pxu
@@ -258,7 +258,7 @@ plugin: shell
category_id: com.canonical.plainbox::graphics
id: graphics/{index}_gl_support_{product_slug}
requires: package.name == 'nux-tools'
-command: ! /usr/lib/nux/unity_support_test -p 2>&1 | ansi_parser | grep -e ":\(\s\+\)no$" -ie "error"
+command: ! /usr/lib/nux/unity_support_test -p 2>&1 | ansi_parser.py | grep -e ":\(\s\+\)no$" -ie "error"
estimated_duration: 0.131
_description: Check that {vendor} {product} hardware is able to run a desktop session (OpenGL)
_summary: Test OpenGL support for {vendor} {product}
@@ -373,7 +373,7 @@ plugin: shell
category_id: com.canonical.plainbox::graphics
id: graphics/{index}_screenshot_{product_slug}
requires: package.name == 'fswebcam'
-command: set -o pipefail; camera_test still --device=/dev/external_webcam -f $PLAINBOX_SESSION_SHARE/screenshot_{index}.jpg -q 2>&1 | ansi_parser
+command: set -o pipefail; camera_test still --device=/dev/external_webcam -f $PLAINBOX_SESSION_SHARE/screenshot_{index}.jpg -q 2>&1 | ansi_parser.py
_summary: Test grabbing a screenshot for {vendor} {product}
_description:
PURPOSE:
@@ -404,7 +404,7 @@ command:
gsettings set org.gnome.totem repeat true
totem --fullscreen $PLAINBOX_PROVIDER_DATA/video/Ogg_Theora_Video.ogv 2>/dev/null &
set -o pipefail
- sleep 15 && camera_test still --device=/dev/external_webcam -f $PLAINBOX_SESSION_SHARE/screenshot_fullscreen_video_{index}.jpg -q 2>&1 | ansi_parser
+ sleep 15 && camera_test still --device=/dev/external_webcam -f $PLAINBOX_SESSION_SHARE/screenshot_fullscreen_video_{index}.jpg -q 2>&1 | ansi_parser.py
sleep 5 && pkill totem
gsettings set org.gnome.totem repeat false
_summary: Test FSV screenshot for {vendor} {product}
diff --git a/units/graphics/legacy.pxu b/units/graphics/legacy.pxu
index 6f18e02..07bedd7 100644
--- a/units/graphics/legacy.pxu
+++ b/units/graphics/legacy.pxu
@@ -157,7 +157,7 @@ plugin: shell
category_id: com.canonical.plainbox::graphics
id: graphics/gl_support
requires: package.name == 'nux-tools'
-command: ! /usr/lib/nux/unity_support_test -p 2>&1 | ansi_parser | grep -e ":\(\s\+\)no$" -ie "error"
+command: ! /usr/lib/nux/unity_support_test -p 2>&1 | ansi_parser.py | grep -e ":\(\s\+\)no$" -ie "error"
estimated_duration: 0.131
_description: Check that hardware is able to run a desktop session (OpenGL)
_summary: Test OpenGL support
@@ -218,7 +218,7 @@ plugin: shell
category_id: com.canonical.plainbox::graphics
id: graphics/screenshot
requires: package.name == 'fswebcam'
-command: set -o pipefail; camera_test still --device=/dev/external_webcam -f ${PLAINBOX_SESSION_SHARE}/screenshot.jpg -q 2>&1 | ansi_parser
+command: set -o pipefail; camera_test still --device=/dev/external_webcam -f ${PLAINBOX_SESSION_SHARE}/screenshot.jpg -q 2>&1 | ansi_parser.py
_summary: Test grabbing a screenshot
_description:
PURPOSE:
@@ -245,7 +245,7 @@ command:
gsettings set org.gnome.totem repeat true
totem --fullscreen ${PLAINBOX_PROVIDER_DATA}/video/Ogg_Theora_Video.ogv 2>/dev/null &
set -o pipefail
- sleep 15 && camera_test still --device=/dev/external_webcam -f ${PLAINBOX_SESSION_SHARE}/screenshot_fullscreen_video.jpg -q 2>&1 | ansi_parser
+ sleep 15 && camera_test still --device=/dev/external_webcam -f ${PLAINBOX_SESSION_SHARE}/screenshot_fullscreen_video.jpg -q 2>&1 | ansi_parser.py
sleep 5 && totem --quit 2>/dev/null
gsettings set org.gnome.totem repeat false
_summary: Test FSV screenshot
diff --git a/units/info/jobs.pxu b/units/info/jobs.pxu
index e1d56ae..aa3a356 100644
--- a/units/info/jobs.pxu
+++ b/units/info/jobs.pxu
@@ -19,9 +19,9 @@ category_id: com.canonical.plainbox::info
user: root
command:
if [ -e /var/log/dmesg ]; then
- cat /var/log/dmesg | ansi_parser
+ cat /var/log/dmesg | ansi_parser.py
else
- dmesg | ansi_parser
+ dmesg | ansi_parser.py
fi
estimated_duration: 0.640
_description: Attaches a copy of /var/log/dmesg or the current dmesg buffer to the test results
diff --git a/units/optical/jobs.pxu b/units/optical/jobs.pxu
index 53a2877..8b92eb1 100644
--- a/units/optical/jobs.pxu
+++ b/units/optical/jobs.pxu
@@ -51,7 +51,7 @@ estimated_duration: 120.0
requires:
optical_drive_{name}.cd_write == 'supported'
user: root
-command: set -o pipefail; optical_write_test /dev/{name} cd | ansi_parser
+command: set -o pipefail; optical_write_test /dev/{name} cd | ansi_parser.py
_description:
PURPOSE:
This test will check your system's {product} CD writing capabilities. This test requires a blank CD-R or CD+R.
@@ -73,7 +73,7 @@ estimated_duration: 120.0
requires:
optical_drive_{name}.cd_write == 'supported'
user: root
-command: set -o pipefail; optical_write_test /dev/{name} cd | ansi_parser
+command: set -o pipefail; optical_write_test /dev/{name} cd | ansi_parser.py
_description:
This is an automated version of optical/cdrom-write. It assumes you have already inserted a data CD into your {product} optical drive prior to running Checkbox.
@@ -111,7 +111,7 @@ requires:
optical_drive_{name}.dvd_write == 'supported'
estimated_duration: 120.0
user: root
-command: set -o pipefail; optical_write_test /dev/{name} dvd | ansi_parser
+command: set -o pipefail; optical_write_test /dev/{name} dvd | ansi_parser.py
_description:
PURPOSE:
This test will check your system's {product} writing capabilities. This test requires a blank DVD-R or DVD+R.
@@ -133,7 +133,7 @@ estimated_duration: 120.0
requires:
optical_drive_{name}.dvd_write == 'supported'
user: root
-command: set -o pipefail; optical_write_test /dev/{name} dvd | ansi_parser
+command: set -o pipefail; optical_write_test /dev/{name} dvd | ansi_parser.py
_description:
This is an automated version of optical/dvd-write. It assumes you have already inserted a data DVD into your {product} optical drive prior to running Checkbox.
@@ -186,7 +186,7 @@ requires:
optical_drive_{name}.bd_write == "supported"
package.name == "growisofs"
user: root
-command: set -o pipefail; optical_write_test /dev/{name} bd | ansi_parser
+command: set -o pipefail; optical_write_test /dev/{name} bd | ansi_parser.py
estimated_duration: 120.00
_description:
PURPOSE:
diff --git a/units/suspend/suspend-graphics.pxu b/units/suspend/suspend-graphics.pxu
index b0a8608..812508b 100644
--- a/units/suspend/suspend-graphics.pxu
+++ b/units/suspend/suspend-graphics.pxu
@@ -125,7 +125,7 @@ depends:
requires: package.name == 'nux-tools'
command:
source graphics_env {{ driver }} {{ index }}
- ! /usr/lib/nux/unity_support_test -p 2>&1 | ansi_parser | grep -e ":\(\s\+\)no$" -ie "error"
+ ! /usr/lib/nux/unity_support_test -p 2>&1 | ansi_parser.py | grep -e ":\(\s\+\)no$" -ie "error"
estimated_duration: 0.130
_description: Check that {{ product }} hardware is able to run a desktop session (OpenGL)
_summary: Test OpenGL support for {{ product }} after suspend
diff --git a/units/suspend/suspend.pxu b/units/suspend/suspend.pxu
index cd8a521..cce3ad9 100644
--- a/units/suspend/suspend.pxu
+++ b/units/suspend/suspend.pxu
@@ -119,7 +119,7 @@ command:
rfkill unblock bluetooth
sleep 3
fi
- set -o pipefail; bluetooth_test $PLAINBOX_PROVIDER_DATA/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR send 2>&1 | ansi_parser
+ set -o pipefail; bluetooth_test $PLAINBOX_PROVIDER_DATA/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR send 2>&1 | ansi_parser.py
_summary: Bluetooth OBEX send before suspend
_description:
This is an automated Bluetooth file transfer test. It sends an image to the device specified by the BTDEVADDR environment variable.
@@ -148,7 +148,7 @@ command:
rfkill unblock bluetooth
sleep 3
fi
- set -o pipefail; bluetooth_test $PLAINBOX_PROVIDER_DATA/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR browse 2>&1 | ansi_parser
+ set -o pipefail; bluetooth_test $PLAINBOX_PROVIDER_DATA/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR browse 2>&1 | ansi_parser.py
_summary: Bluetooth OBEX browse before suspend
_description:
This is an automated Bluetooth test. It emulates browsing on a remote device specified by the BTDEVADDR environment variable.
@@ -177,7 +177,7 @@ command:
rfkill unblock bluetooth
sleep 3
fi
- set -o pipefail; bluetooth_test $PLAINBOX_PROVIDER_DATA/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR get 2>&1 | ansi_parser
+ set -o pipefail; bluetooth_test $PLAINBOX_PROVIDER_DATA/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR get 2>&1 | ansi_parser.py
_summary: Bluetooth OBEX get before suspend
_description:
This is an automated Bluetooth test. It receives the given file from a remote host specified by the BTDEVADDR environment variable
@@ -966,7 +966,7 @@ command:
rfkill unblock bluetooth
sleep 3
fi
- set -o pipefail; bluetooth_test $PLAINBOX_PROVIDER_DATA/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR send 2>&1 | ansi_parser
+ set -o pipefail; bluetooth_test $PLAINBOX_PROVIDER_DATA/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR send 2>&1 | ansi_parser.py
_description:
This is an automated Bluetooth file transfer test. It sends an image to the device specified by the BTDEVADDR environment variable.
@@ -995,7 +995,7 @@ command:
rfkill unblock bluetooth
sleep 3
fi
- set -o pipefail; bluetooth_test $PLAINBOX_PROVIDER_DATA/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR send 2>&1 | ansi_parser
+ set -o pipefail; bluetooth_test $PLAINBOX_PROVIDER_DATA/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR send 2>&1 | ansi_parser.py
_description:
This is an automated Bluetooth file transfer test. It sends an image to the device specified by the BTDEVADDR environment variable.
@@ -1024,7 +1024,7 @@ command:
rfkill unblock bluetooth
sleep 3
fi
- set -o pipefail; bluetooth_test $PLAINBOX_PROVIDER_DATA/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR browse 2>&1 | ansi_parser
+ set -o pipefail; bluetooth_test $PLAINBOX_PROVIDER_DATA/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR browse 2>&1 | ansi_parser.py
_description:
This is an automated Bluetooth test. It emulates browsing on a remote device specified by the BTDEVADDR environment variable.
@@ -1053,7 +1053,7 @@ command:
rfkill unblock bluetooth
sleep 3
fi
- set -o pipefail; bluetooth_test $PLAINBOX_PROVIDER_DATA/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR browse 2>&1 | ansi_parser
+ set -o pipefail; bluetooth_test $PLAINBOX_PROVIDER_DATA/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR browse 2>&1 | ansi_parser.py
_description:
This is an automated Bluetooth test. It emulates browsing on a remote device specified by the BTDEVADDR environment variable.
@@ -1082,7 +1082,7 @@ command:
rfkill unblock bluetooth
sleep 3
fi
- set -o pipefail; bluetooth_test $PLAINBOX_PROVIDER_DATA/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR get 2>&1 | ansi_parser
+ set -o pipefail; bluetooth_test $PLAINBOX_PROVIDER_DATA/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR get 2>&1 | ansi_parser.py
_description:
This is an automated Bluetooth test. It receives the given file from a remote host specified by the BTDEVADDR environment variable
@@ -1111,7 +1111,7 @@ command:
rfkill unblock bluetooth
sleep 3
fi
- set -o pipefail; bluetooth_test $PLAINBOX_PROVIDER_DATA/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR get 2>&1 | ansi_parser
+ set -o pipefail; bluetooth_test $PLAINBOX_PROVIDER_DATA/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR get 2>&1 | ansi_parser.py
_description:
This is an automated Bluetooth test. It receives the given file from a remote host specified by the BTDEVADDR environment variable
@@ -1223,7 +1223,7 @@ id: suspend/screenshot_after_suspend
estimated_duration: 10.0
depends: suspend/suspend_advanced_auto
requires: package.name == 'fswebcam'
-command: set -o pipefail; camera_test still --device=/dev/external_webcam -f ${PLAINBOX_SESSION_SHARE}/screenshot_after_suspend.jpg -q 2>&1 | ansi_parser
+command: set -o pipefail; camera_test still --device=/dev/external_webcam -f ${PLAINBOX_SESSION_SHARE}/screenshot_after_suspend.jpg -q 2>&1 | ansi_parser.py
_description:
PURPOSE:
Take a screengrab of the current screen after suspend (logged on Unity desktop)
@@ -2123,7 +2123,7 @@ category_id: com.canonical.plainbox::suspend
id: suspend/{index}_gl_support_after_suspend_{product_slug}
depends: suspend/{index}_suspend_after_switch_to_card_{product_slug}
requires: package.name == 'nux-tools'
-command: ! /usr/lib/nux/unity_support_test -p 2>&1 | ansi_parser | grep -e ":\(\s\+\)no$" -ie "error"
+command: ! /usr/lib/nux/unity_support_test -p 2>&1 | ansi_parser.py | grep -e ":\(\s\+\)no$" -ie "error"
estimated_duration: 0.130
_description: Check that {product} hardware is able to run a desktop session (OpenGL) after suspend
_summary: Test OpenGL support for {product} after suspend
@@ -2133,7 +2133,7 @@ category_id: com.canonical.plainbox::suspend
id: suspend/gl_support_after_suspend
depends: suspend/suspend_advanced
requires: package.name == 'nux-tools'
-command: ! /usr/lib/nux/unity_support_test -p 2>&1 | ansi_parser | grep -e ":\(\s\+\)no$" -ie "error"
+command: ! /usr/lib/nux/unity_support_test -p 2>&1 | ansi_parser.py | grep -e ":\(\s\+\)no$" -ie "error"
estimated_duration: 0.130
_description: Check that the hardware is able to run a desktop session (OpenGL)
_summary: Test OpenGL support after suspend