summaryrefslogtreecommitdiff
diff options
authorSylvain Pineau <sylvain.pineau@canonical.com>2017-10-24 10:37:45 +0200
committerSylvain Pineau <sylvain.pineau@canonical.com>2017-10-24 10:37:45 +0200
commit4a4377470cb14617d22c83e0dde5372764ec2a08 (patch)
treec2b0dc823dc630146a6521f84f68e0463b469592
parentd045ea780449537f75601e52d57ed15cbc73f5ae (diff)
parent7d0758723e7e72028790cd3ab046df2ffa8b8326 (diff)
record new upstream branch created by importing plainbox-provider-checkbox_0.40.0~rc5.orig.tar.gz and merge it
-rw-r--r--debian/.git-dpm14
-rwxr-xr-xmanage.py2
-rw-r--r--units/keys/jobs.pxu26
-rw-r--r--units/keys/test-plan.pxu44
4 files changed, 43 insertions, 43 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm
index 13ea792..d8f76e7 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,8 +1,8 @@
# see git-dpm(1) from git-dpm package
-8799229314922b371c55ffd161bce9af518e335e
-8799229314922b371c55ffd161bce9af518e335e
-8799229314922b371c55ffd161bce9af518e335e
-8799229314922b371c55ffd161bce9af518e335e
-plainbox-provider-checkbox_0.40.0~rc4.orig.tar.gz
-2417ec469e1f7167e002d5ee4aa233ba6d1f2c09
-1737722
+7d0758723e7e72028790cd3ab046df2ffa8b8326
+7d0758723e7e72028790cd3ab046df2ffa8b8326
+7d0758723e7e72028790cd3ab046df2ffa8b8326
+7d0758723e7e72028790cd3ab046df2ffa8b8326
+plainbox-provider-checkbox_0.40.0~rc5.orig.tar.gz
+5b2d48f858f794a3d89e339b9e67d43b850e26f3
+1737700
diff --git a/manage.py b/manage.py
index f6ad4c3..31f89e4 100755
--- a/manage.py
+++ b/manage.py
@@ -5,7 +5,7 @@ from plainbox.provider_manager import N_
setup(
name='plainbox-provider-checkbox',
namespace='com.canonical.certification',
- version="0.40.0rc4",
+ version="0.40.0rc5",
description=N_("Checkbox provider"),
gettext_domain='plainbox-provider-checkbox',
strict=False, deprecated=False,
diff --git a/units/keys/jobs.pxu b/units/keys/jobs.pxu
index 6923941..4402b4c 100644
--- a/units/keys/jobs.pxu
+++ b/units/keys/jobs.pxu
@@ -4,7 +4,7 @@ id: keys/lock-screen
estimated_duration: 30.0
imports: from com.canonical.plainbox import manifest
requires: manifest.has_special_keys == 'True'
-flags: also-after-suspend
+flags: also-after-suspend-manual
command: lock_screen_watcher
_description:
PURPOSE:
@@ -24,7 +24,7 @@ id: keys/brightness
estimated_duration: 30.0
imports: from com.canonical.plainbox import manifest
requires: manifest.has_special_keys == 'True'
-flags: also-after-suspend
+flags: also-after-suspend-manual
_description:
PURPOSE:
This test will test the brightness key
@@ -39,7 +39,7 @@ id: keys/volume
estimated_duration: 30.0
imports: from com.canonical.plainbox import manifest
requires: manifest.has_special_keys == 'True'
-flags: also-after-suspend
+flags: also-after-suspend-manual
user: root
command: key_test -s '0xe02e,0xe0ae:Volume Down' '0xe030,0xe0b0:Volume Up'
_description:
@@ -58,7 +58,7 @@ id: keys/mute
estimated_duration: 30.0
imports: from com.canonical.plainbox import manifest
requires: manifest.has_special_keys == 'True'
-flags: also-after-suspend
+flags: also-after-suspend-manual
user: root
command: key_test -s '0xe020,0xe0a0:Mute'
_description:
@@ -76,7 +76,7 @@ id: keys/sleep
estimated_duration: 90.0
imports: from com.canonical.plainbox import manifest
requires: manifest.has_special_keys == 'True'
-flags: also-after-suspend
+flags: also-after-suspend-manual
_description:
PURPOSE:
This test will test the sleep key
@@ -92,7 +92,7 @@ id: keys/battery-info
estimated_duration: 30.0
imports: from com.canonical.plainbox import manifest
requires: manifest.has_special_keys == 'True'
-flags: also-after-suspend
+flags: also-after-suspend-manual
user: root
command: key_test -s '0xe071,0xef1:Battery Info'
_description:
@@ -112,7 +112,7 @@ id: keys/wireless
estimated_duration: 90.0
imports: from com.canonical.plainbox import manifest
requires: manifest.has_special_keys == 'True'
-flags: also-after-suspend
+flags: also-after-suspend-manual
_description:
PURPOSE:
This test will test the wireless key
@@ -134,7 +134,7 @@ id: keys/media-control
estimated_duration: 30.0
imports: from com.canonical.plainbox import manifest
requires: manifest.has_special_keys == 'True'
-flags: also-after-suspend
+flags: also-after-suspend-manual
user: root
command: key_test -s 0xe010,0xe090:Previous 0xe024,0xe0a4:Stop 0xe019,0xe099:Next 0xe022,0xe0a2:Play
_description:
@@ -153,7 +153,7 @@ id: keys/super
estimated_duration: 30.0
imports: from com.canonical.plainbox import manifest
requires: manifest.has_special_keys == 'True'
-flags: also-after-suspend
+flags: also-after-suspend-manual
user: root
command: key_test -s '0xe05b,0xe0db:Left Super Key'
_description:
@@ -171,7 +171,7 @@ id: keys/video-out
estimated_duration: 120.0
imports: from com.canonical.plainbox import manifest
requires: manifest.has_special_keys == 'True'
-flags: also-after-suspend
+flags: also-after-suspend-manual
_description:
PURPOSE:
Validate that the External Video hot key is working as expected
@@ -187,7 +187,7 @@ id: keys/touchpad
estimated_duration: 30.0
imports: from com.canonical.plainbox import manifest
requires: manifest.has_special_keys == 'True'
-flags: also-after-suspend
+flags: also-after-suspend-manual
_description:
PURPOSE:
Verify touchpad hotkey toggles touchpad functionality on and off
@@ -204,7 +204,7 @@ id: keys/keyboard-backlight
estimated_duration: 30.0
imports: from com.canonical.plainbox import manifest
requires: manifest.has_special_keys == 'True'
-flags: also-after-suspend
+flags: also-after-suspend-manual
_description:
PURPOSE:
Verify that the keyboard backlight toggle key works properly
@@ -227,7 +227,7 @@ requires:
package.name == 'alsa-base'
package.name == 'pulseaudio-utils'
package.name == 'gstreamer1.0-plugins-good' or package.name == 'gstreamer0.10-plugins-good'
-flags: also-after-suspend
+flags: also-after-suspend-manual
command:
audio_settings store --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings
audio_settings set --device=pci --volume=50
diff --git a/units/keys/test-plan.pxu b/units/keys/test-plan.pxu
index c258338..4fd7092 100644
--- a/units/keys/test-plan.pxu
+++ b/units/keys/test-plan.pxu
@@ -22,17 +22,17 @@ _name: Special keys tests (after suspend)
_description:
Special keys tests (after suspend)
include:
- after-suspend-keys/lock-screen certification-status=blocker
- after-suspend-keys/super certification-status=blocker
- after-suspend-keys/battery-info certification-status=blocker
- after-suspend-keys/brightness certification-status=blocker
- after-suspend-keys/media-control certification-status=blocker
- after-suspend-keys/mute certification-status=blocker
- after-suspend-keys/volume certification-status=blocker
- after-suspend-keys/video-out certification-status=blocker
- after-suspend-keys/wireless certification-status=blocker
- after-suspend-keys/keyboard-backlight certification-status=blocker
- after-suspend-keys/microphone-mute certification-status=blocker
+ after-suspend-manual-keys/lock-screen certification-status=blocker
+ after-suspend-manual-keys/super certification-status=blocker
+ after-suspend-manual-keys/battery-info certification-status=blocker
+ after-suspend-manual-keys/brightness certification-status=blocker
+ after-suspend-manual-keys/media-control certification-status=blocker
+ after-suspend-manual-keys/mute certification-status=blocker
+ after-suspend-manual-keys/volume certification-status=blocker
+ after-suspend-manual-keys/video-out certification-status=blocker
+ after-suspend-manual-keys/wireless certification-status=blocker
+ after-suspend-manual-keys/keyboard-backlight certification-status=blocker
+ after-suspend-manual-keys/microphone-mute certification-status=blocker
id: keys-cert-blockers
unit: test plan
@@ -59,14 +59,14 @@ _name: Special keys tests (certification blockers only, after suspend)
_description:
Special keys tests (certification blockers only, after suspend)
include:
- after-suspend-keys/lock-screen certification-status=blocker
- after-suspend-keys/super certification-status=blocker
- after-suspend-keys/battery-info certification-status=blocker
- after-suspend-keys/brightness certification-status=blocker
- after-suspend-keys/media-control certification-status=blocker
- after-suspend-keys/mute certification-status=blocker
- after-suspend-keys/volume certification-status=blocker
- after-suspend-keys/video-out certification-status=blocker
- after-suspend-keys/wireless certification-status=blocker
- after-suspend-keys/keyboard-backlight certification-status=blocker
- after-suspend-keys/microphone-mute certification-status=blocker
+ after-suspend-manual-keys/lock-screen certification-status=blocker
+ after-suspend-manual-keys/super certification-status=blocker
+ after-suspend-manual-keys/battery-info certification-status=blocker
+ after-suspend-manual-keys/brightness certification-status=blocker
+ after-suspend-manual-keys/media-control certification-status=blocker
+ after-suspend-manual-keys/mute certification-status=blocker
+ after-suspend-manual-keys/volume certification-status=blocker
+ after-suspend-manual-keys/video-out certification-status=blocker
+ after-suspend-manual-keys/wireless certification-status=blocker
+ after-suspend-manual-keys/keyboard-backlight certification-status=blocker
+ after-suspend-manual-keys/microphone-mute certification-status=blocker