summaryrefslogtreecommitdiff
diff options
-rw-r--r--jobs/audio.txt.in2
-rw-r--r--jobs/bluetooth.txt.in2
-rw-r--r--jobs/monitor.txt.in2
-rw-r--r--jobs/usb.txt.in21
-rwxr-xr-xmanage.py2
-rw-r--r--po/bg.po4
-rw-r--r--po/de.po4
-rw-r--r--po/fr.po4
-rw-r--r--po/pl.po4
-rw-r--r--po/zh_TW.po4
10 files changed, 22 insertions, 27 deletions
diff --git a/jobs/audio.txt.in b/jobs/audio.txt.in
index 79b0445..fc7c4c4 100644
--- a/jobs/audio.txt.in
+++ b/jobs/audio.txt.in
@@ -154,7 +154,7 @@ id: audio/{index}_playback_type-c_displayport_{product_slug}
imports: from 2013.com.canonical.plainbox import manifest
estimated_duration: 30.0
requires:
- manifest.has_usb_type_c
+ manifest.has_usb_type_c == 'True'
display.dp == 'supported'
device.category == 'AUDIO'
package.name == 'alsa-base'
diff --git a/jobs/bluetooth.txt.in b/jobs/bluetooth.txt.in
index 4df27fb..30d7e90 100644
--- a/jobs/bluetooth.txt.in
+++ b/jobs/bluetooth.txt.in
@@ -22,7 +22,7 @@ command:
output=$(hcitool dev | tail -n+2 | awk '{print $2}' | tee $PLAINBOX_SESSION_SHARE/bluetooth_address)
echo "$output"
if [ -z "$output" ]; then
- "BT hardware not available"
+ echo "BT hardware not available"
exit 1
fi
_description:
diff --git a/jobs/monitor.txt.in b/jobs/monitor.txt.in
index 1502a14..f40908b 100644
--- a/jobs/monitor.txt.in
+++ b/jobs/monitor.txt.in
@@ -174,7 +174,7 @@ unit: template
template-resource: graphics_card
id: monitor/{index}_type-c_displayport_{product_slug}
imports: from 2013.com.canonical.plainbox import manifest
-requires: manifest.has_usb_type_c
+requires: manifest.has_usb_type_c == 'True'
estimated_duration: 15.0
plugin: manual
category_id: 2013.com.canonical.plainbox::monitor
diff --git a/jobs/usb.txt.in b/jobs/usb.txt.in
index 48e517b..1db807d 100644
--- a/jobs/usb.txt.in
+++ b/jobs/usb.txt.in
@@ -3,11 +3,6 @@ id: has_usb_type_c
_name: USB Type-C Support
value-type: bool
-unit: manifest entry
-id: has_usb_type_c_charging
-_name: USB Type-C Charging Port
-value-type: bool
-
plugin: shell
category_id: 2013.com.canonical.plainbox::usb
id: usb/detect
@@ -51,7 +46,7 @@ plugin: user-interact-verify
category_id: 2013.com.canonical.plainbox::usb
id: usb-c/c-to-a-adapter/hid
imports: from 2013.com.canonical.plainbox import manifest
-requires: manifest.has_usb_type_c
+requires: manifest.has_usb_type_c == 'True'
depends: usb/detect
estimated_duration: 10.0
command: keyboard_test
@@ -69,7 +64,7 @@ plugin: user-interact-verify
category_id: 2013.com.canonical.plainbox::usb
id: usb-c/hid
imports: from 2013.com.canonical.plainbox import manifest
-requires: manifest.has_usb_type_c
+requires: manifest.has_usb_type_c == 'True'
depends: usb/detect
estimated_duration: 10.0
command: keyboard_test
@@ -126,7 +121,7 @@ id: usb-c/c-to-a-adapter/insert
imports: from 2013.com.canonical.plainbox import manifest
requires:
usb.usb3 == 'supported'
- manifest.has_usb_type_c
+ manifest.has_usb_type_c == 'True'
estimated_duration: 10.0
command: removable_storage_watcher -m 500000000 insert usb
_purpose:
@@ -148,7 +143,7 @@ id: usb-c/insert
imports: from 2013.com.canonical.plainbox import manifest
requires:
usb.usb3 == 'supported'
- manifest.has_usb_type_c
+ manifest.has_usb_type_c == 'True'
estimated_duration: 10.0
command: removable_storage_watcher -m 500000000 insert usb
_purpose:
@@ -205,7 +200,7 @@ imports: from 2013.com.canonical.plainbox import manifest
depends: usb-c/c-to-a-adapter/insert
requires:
usb.usb3 == 'supported'
- manifest.has_usb_type_c
+ manifest.has_usb_type_c == 'True'
estimated_duration: 10.0
command: removable_storage_watcher -m 500000000 remove usb
_purpose:
@@ -226,7 +221,7 @@ imports: from 2013.com.canonical.plainbox import manifest
depends: usb-c/insert
requires:
usb.usb3 == 'supported'
- manifest.has_usb_type_c
+ manifest.has_usb_type_c == 'True'
estimated_duration: 10.0
command: removable_storage_watcher -m 500000000 remove usb
_purpose:
@@ -305,7 +300,7 @@ id: usb-c/c-to-a-adapter/storage-automated
imports: from 2013.com.canonical.plainbox import manifest
requires:
usb.usb3 == 'supported'
- manifest.has_usb_type_c
+ manifest.has_usb_type_c == 'True'
depends: usb-c/c-to-a-adapter/insert
user: root
estimated_duration: 45.0
@@ -320,7 +315,7 @@ id: usb-c/storage-automated
imports: from 2013.com.canonical.plainbox import manifest
requires:
usb.usb3 == 'supported'
- manifest.has_usb_type_c
+ manifest.has_usb_type_c == 'True'
depends: usb-c/insert
user: root
estimated_duration: 45.0
diff --git a/manage.py b/manage.py
index 79d04b9..75a162e 100755
--- a/manage.py
+++ b/manage.py
@@ -5,7 +5,7 @@ from plainbox.provider_manager import N_
setup(
name='plainbox-provider-checkbox',
namespace='2013.com.canonical.certification',
- version="0.28",
+ version="0.29",
description=N_("Checkbox provider"),
gettext_domain='plainbox-provider-checkbox',
strict=False, deprecated=False,
diff --git a/po/bg.po b/po/bg.po
index 6bd8154..f62600e 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-05-14 05:13+0000\n"
-"X-Generator: Launchpad (build 18025)\n"
+"X-Launchpad-Export-Date: 2016-06-14 05:18+0000\n"
+"X-Generator: Launchpad (build 18097)\n"
#. description
#: ../jobs/audio.txt.in:9 ../units/dock.pxu:108
diff --git a/po/de.po b/po/de.po
index 77eaf2e..f07a1e2 100644
--- a/po/de.po
+++ b/po/de.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-05-14 05:13+0000\n"
-"X-Generator: Launchpad (build 18025)\n"
+"X-Launchpad-Export-Date: 2016-06-14 05:18+0000\n"
+"X-Generator: Launchpad (build 18097)\n"
#. description
#: ../jobs/audio.txt.in:9 ../units/dock.pxu:108
diff --git a/po/fr.po b/po/fr.po
index 3d5a504..cf48471 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-05-14 05:13+0000\n"
-"X-Generator: Launchpad (build 18025)\n"
+"X-Launchpad-Export-Date: 2016-06-14 05:18+0000\n"
+"X-Generator: Launchpad (build 18097)\n"
#. description
#: ../jobs/audio.txt.in:9 ../units/dock.pxu:108
diff --git a/po/pl.po b/po/pl.po
index 43ce92e..ea55807 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-05-14 05:13+0000\n"
-"X-Generator: Launchpad (build 18025)\n"
+"X-Launchpad-Export-Date: 2016-06-14 05:18+0000\n"
+"X-Generator: Launchpad (build 18097)\n"
"Language: Polish\n"
#. description
diff --git a/po/zh_TW.po b/po/zh_TW.po
index cd4cfea..7d660f9 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-05-14 05:13+0000\n"
-"X-Generator: Launchpad (build 18025)\n"
+"X-Launchpad-Export-Date: 2016-06-14 05:18+0000\n"
+"X-Generator: Launchpad (build 18097)\n"
#. description
#: ../jobs/audio.txt.in:9 ../units/dock.pxu:108