Import plainbox-provider-checkbox_0.21.3.orig.tar.gzupstream-0.21.3patched-0.21.3-1

7 files changed, 140 insertions, 21 deletions

diff --git a/bin/fwts_test b/bin/fwts_test
index 127858a..7f05d56 100755
--- a/bin/fwts_test
+++ b/bin/fwts_test
@@ -19,38 +19,31 @@ INTERACTIVE_TESTS = ['ac_adapter',
 'brightness',
 'lid']
 # These are usually performed on normal certification runs
-CERT_TESTS = ['acpidump',
+CERT_TESTS = ['acpitests',
+ 'acpidump',
 'acpitables',
 'apicedge',
 'apicinstance',
 'aspm',
 'bios32',
- 'checksum',
- 'cstates',
- 'dmar',
+ 'dmicheck',
 'ebda',
- 'fadt',
- 'hpet_check',
 'klog',
- 'mcfg',
- 'method',
 'mpcheck',
 'msr',
 'mtrr',
 'nx',
 'oops',
+ 'uefibootpath',
 'uefirtvariable',
 'version',
- 'virt',
- 'wmi']
+ 'virt']
 # These are advanced tests that shouldn't affect certification status
-NON_CERT_TESTS = ['acpiinfo',
- 'bios_info',
+NON_CERT_TESTS = ['bios_info',
 'cmosdump',
 'crs',
 'crsdump',
 'csm',
- 'dmicheck',
 'ebdadump',
 'fan',
 'gpedump',
@@ -62,7 +55,6 @@ NON_CERT_TESTS = ['acpiinfo',
 'mpdump',
 'os2gap',
 'osilinux',
- 'pcc',
 'pciirq',
 'plddump',
 'pnp',
@@ -77,6 +69,13 @@ NON_CERT_TESTS = ['acpiinfo',
 ]
 TESTS = sorted(CERT_TESTS + NON_CERT_TESTS)
 
+# The following tests will record logs in a separate file for the HWE team
+HWE_TESTS = ['mtrr',
+ 'virt',
+ 'apicedge',
+ 'klog',
+ 'oops',
+ 'uefibootpath']
 
 def get_sleep_times(start_marker, end_marker, sleep_time, resume_time):
 logfile = '/var/log/syslog'
@@ -380,8 +379,14 @@ def main():
 results['sleep'] = 'FAILED_CRITICAL'
 else:
 for test in tests:
+ # ACPI tests can now be run with --acpitests (fwts >= 15.07.00)
+ log = args.log
+ if test in HWE_TESTS:
+ log = log.replace('.log', '_hwe.log')
+ if test == 'acpitests':
+ test = '--acpitests'
 command = ('fwts -q --stdout-summary -r %s %s'
- % (args.log, test))
+ % (log, test))
 results[test] = (Popen(command, stdout=PIPE, shell=True)
 .communicate()[0].strip()).decode()
 
diff --git a/bin/virtualization b/bin/virtualization
index f1d043c..f9d1f1f 100755
--- a/bin/virtualization
+++ b/bin/virtualization
@@ -111,7 +111,7 @@ QEMU_ARCH_CONFIG = {
 'qemu_bin': 'qemu-system-ppc64',
 'qemu_disk_type': QEMU_DISK_TYPE_VIRTIO,
 'qemu_extra_args': [
- '-machine', 'prep',
+ '-machine', 'pseries',
 ],
 },
 }
diff --git a/data/touch_continuous_move_test.qml b/data/touch_continuous_move_test.qml
new file mode 100644
index 0000000..1913719
--- /dev/null
+++ b/data/touch_continuous_move_test.qml
@@ -0,0 +1,93 @@
+/* This file is part of Checkbox.
+
+ Copyright 2015 Canonical Ltd.
+ Written by:
+ Sylvain Pineau <sylvain.pineau@canonical.com>
+
+ Checkbox is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 3,
+ as published by the Free Software Foundation.
+
+ Checkbox is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Checkbox. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Rectangle {
+ width: 500
+ height: 500
+
+ MouseArea {
+ anchors.fill: parent
+ anchors.margins: 30
+ onPositionChanged: {
+ if (timer2.running) {
+ timer2.restart();
+ }
+ }
+ hoverEnabled: true
+ }
+
+ Column {
+ spacing: units.gu(5)
+ anchors.centerIn: parent
+ Text {
+ id: legend
+ anchors.horizontalCenter: parent.horizontalCenter
+ text: "Continuously move your mouse cursor"
+ font.bold: true
+ font.pointSize: 30
+ }
+ Text {
+ id: countdown
+ anchors.horizontalCenter: parent.horizontalCenter
+ text: " "
+ font.pointSize: 40
+ }
+ }
+
+ Timer {
+ id: timer1
+ interval: 1000
+ running: true
+ repeat: true
+ property int timeout: 11
+ onTriggered: {
+ timeout = timeout - 1
+ countdown.text = timeout
+ if (timeout <= 0) {
+ running = false
+ console.log("PASS")
+ Qt.quit()
+ }
+ }
+ }
+
+ Timer {
+ id: timer2
+ interval: 200
+ running: false
+ repeat: true
+ onTriggered: {
+ running = false
+ console.log("FAIL")
+ Qt.quit()
+ }
+ }
+
+ Timer {
+ id: timer3
+ interval: 2000
+ running: true
+ onTriggered: {
+ timer2.running = true
+ }
+ }
+}
diff --git a/jobs/firmware.txt.in b/jobs/firmware.txt.in
index bee0e52..3e6f935 100644
--- a/jobs/firmware.txt.in
+++ b/jobs/firmware.txt.in
@@ -45,20 +45,28 @@ _description:
 _summary: Run FWTS desktop-specific diagnosis tests.
 environ: PLAINBOX_SESSION_SHARE
 command:
- fwts_test -l $PLAINBOX_SESSION_SHARE/fwts_desktop_diagnosis_results.log -t acpidump -t version -t acpitables -t apicinstance -t hpet_check -t mcfg -t method -t mpcheck -t msr -t mtrr -t apicedge -t klog
+ fwts_test -l $PLAINBOX_SESSION_SHARE/fwts_desktop_diagnosis_results.log
 
 plugin: attachment
 estimated_duration: 0.5
 id: firmware/fwts_desktop_diagnosis_results.log
 command:
- [ -e ${PLAINBOX_SESSION_SHARE}/fwts_desktop_diagnosis_results.log ] && gzip -c ${PLAINBOX_SESSION_SHARE}/fwts_desktop_diagnosis_results.log
+ [ -e $PLAINBOX_SESSION_SHARE/fwts_desktop_diagnosis_results.log ] && gzip -c $PLAINBOX_SESSION_SHARE/fwts_desktop_diagnosis_results.log
 _description: Attaches the FWTS desktop diagnosis results log to the submission
 _summary: Attach FWTS desktop diagnosis log to submission
 
+plugin: attachment
+estimated_duration: 0.5
+id: firmware/fwts_desktop_diagnosis_results_hwe.log
+command:
+ [ -e $PLAINBOX_SESSION_SHARE/fwts_desktop_diagnosis_results_hwe.log ] && gzip -c $PLAINBOX_SESSION_SHARE/fwts_desktop_diagnosis_results_hwe.log
+_description: Attaches the FWTS desktop diagnosis results log to the submission (to HWE)
+_summary: Attach FWTS desktop diagnosis log to submission (to HWE)
+
 plugin: shell
 id: firmware/no_ACPI_REV_interface
 _summary: No _REV interface in ACPI [DS]SDT tables
 user: root
 estimated_duration: 0.5
-command: grep -r "_REV" /sys/firmware/acpi/tables/* | grep -v [DS]SDT
-_description: This Automated test checks misuse of the _REV interface in ACPI [DS]SDT tables
+command: ! sudo grep -r "_REV" /sys/firmware/acpi/tables/* | grep [DS]SDT
+_description: This Automated test checks misuse of the _REV interface in ACPI DSDT and SSDT tables
diff --git a/jobs/touchpad.txt.in b/jobs/touchpad.txt.in
index 433f17c..80d8ef4 100644
--- a/jobs/touchpad.txt.in
+++ b/jobs/touchpad.txt.in
@@ -205,3 +205,16 @@ command:
 _description:
 This test will check if your touchpad was detected as a mouse.
 
+plugin: user-interact
+id: touchpad/continuous-move
+requires: dmi.product in ['Notebook','Laptop','Portable']
+estimated_duration: 12
+command: qmlscene -qt5 --fullscreen $PLAINBOX_PROVIDER_DATA/touch_continuous_move_test.qml 2>&1 | grep -o PASS
+_description:
+ PURPOSE:
+ Touchpad continuous move verification
+ STEPS:
+ 1. Select "Test" when ready and continuously move your cursor within the borders of the displayed test window.
+ You'll need to keep moving your finger on the touchpad for 10 seconds.
+ VERIFICATION:
+ Did the mouse cursor move without interruption?
diff --git a/manage.py b/manage.py
index 292a2b3..5c5f1c3 100755
--- a/manage.py
+++ b/manage.py
@@ -4,7 +4,7 @@ from plainbox.provider_manager import N_
 
 setup(
 name='2013.com.canonical.certification:checkbox',
- version="0.21",
+ version="0.21.3",
 description=N_("Checkbox provider"),
 gettext_domain='plainbox-provider-checkbox',
 strict=False, deprecated=False,
diff --git a/po/placeholder.txt b/po/placeholder.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/po/placeholder.txt