Merge lp:~zyga/checkbox/remove-old-piglit into lp:checkbox

[Zygmunt Krynicki]

This branch removes all the traces of piglit from the checkbox provider (along with the __piglit__ local job), adds the __piglit__ job back to the piglit provider and bumps the version of piglit to 0.2

[Sylvain Pineau (sylvain-pineau)]

I had a doubt about applying a category to a local job (xlsx exporter creating the category tree using local jobs or the category units) but it's only used by checkbox touch so far and it's absolutely not a blocker .

thanks for the clanup, +1

review: Approve

=== removed file 'providers/plainbox-provider-checkbox/bin/piglit_test'
--- providers/plainbox-provider-checkbox/bin/piglit_test	2015-01-27 22:29:38 +0000
+++ providers/plainbox-provider-checkbox/bin/piglit_test	1970-01-01 00:00:00 +0000
@@ -1,115 +0,0 @@
-#!/usr/bin/python3
-
-import os
-import sys
-
-from argparse import ArgumentParser
-from subprocess import check_output, STDOUT
-
-
-class PiglitTests:
-
-    def __init__(self, tests, name):
-        self._tests = tests
-        self._name = name
-        self._results = {}
-
-    def run(self):
-        piglit_output = ''
-
-        log_path = os.path.join(os.environ.get('CHECKBOX_DATA', '.'),
-                                'piglit-results', self._name)
-
-        # Need to run in verbose mode to produce output compatible with
-        # our parser.
-        run_command = ["piglit-run.py", "-v"]
-
-        for test in self._tests:
-            run_command.extend(["-t", test])
-
-        run_command.extend(['/usr/share/piglit/tests/all.tests', log_path])
-
-        piglit_env = dict(os.environ)
-        if os.path.isdir("/usr/share/piglit"):
-            piglit_env['PYTHONPATH'] = "/usr/share/piglit"
-
-        piglit_output = check_output(run_command,
-                                     universal_newlines=True,
-                                     stderr=STDOUT,
-                                     env=piglit_env)
-
-        # TODO: Capture stderr instead?
-        for line in piglit_output.split('\n'):
-            if ' :: ' in line:
-                self._results[line.split(' :: ')[-1].strip()] = \
-                    line.split(' :: ')[-2].strip()
-
-    def get_tests_by_status(self, status=None):
-        """
-        Return a list of the tests with the given status in the last piglit run
-        """
-        if not status:
-            return self._results
-        tests = []
-        for test in self._results:
-            if self._results[test] == status:
-                tests.append(test)
-
-        return tests
-
-
-def main():
-    parser = ArgumentParser("A wrapper script for the Piglit graphics test "
-                            "framework which runs the tests and parses the "
-                            "results.")
-    parser.add_argument("--test", "-t",
-                        required=True,
-                        action='append',
-                        help="The expression used to get the tests to run.")
-    parser.add_argument("--name", "-n",
-                        required=True,
-                        help="""A friendly name for this group of tests
-                                to use in reporting.""")
-    parser.add_argument("--verbose", "-v",
-                        action='store_true',
-                        help='Have more verbose output')
-    args = parser.parse_args()
-
-    piglit = PiglitTests(args.test, args.name)
-    piglit.run()
-
-    if not piglit.get_tests_by_status():
-        print("WARNING: Test summary is empty, piglit output may have "
-              "changed. Exiting with error to ensure a human "
-              "looks at this.")
-        return 2
-
-    passed_tests = piglit.get_tests_by_status('pass')
-    if passed_tests:
-        print("%d tests passed" % len(passed_tests))
-
-    if args.verbose:
-        print("\n".join(["- %s" % test for test in passed_tests]))
-
-    failed_tests = piglit.get_tests_by_status('fail')
-    if failed_tests:
-        print("%d tests failed" % len(failed_tests))
-        print("\n".join(["- %s" % test for test in failed_tests]))
-
-    crashed_tests = piglit.get_tests_by_status('crash')
-    if crashed_tests:
-        print("%d tests crashed" % len(crashed_tests))
-        print("\n".join(["- %s" % test for test in crashed_tests]))
-
-    skipped_tests = piglit.get_tests_by_status('skip')
-    if skipped_tests:
-        print("%d tests were skipped" % len(skipped_tests))
-        print("\n".join(["- %s" % test for test in skipped_tests]))
-
-    if len(failed_tests) > 0 or len(crashed_tests) > 0:
-        return 1
-    else:
-        return 0
-
-if __name__ == "__main__":
-    sys.exit(main())

=== modified file 'providers/plainbox-provider-checkbox/jobs/local.txt.in'
--- providers/plainbox-provider-checkbox/jobs/local.txt.in	2014-08-29 17:57:49 +0000
+++ providers/plainbox-provider-checkbox/jobs/local.txt.in	2015-03-31 13:34:54 +0000
@@ -229,13 +229,6 @@
   shopt -s extglob
   cat $PLAINBOX_PROVIDER_DATA/../jobs/peripheral.txt?(.in)
 
-id: __piglit__
-plugin: local
-_description: Piglit tests
-command:
-  shopt -s extglob
-  cat $PLAINBOX_PROVIDER_DATA/../jobs/piglit.txt?(.in)
-
 id: __power-management__
 plugin: local
 _description: Power Management tests

=== removed file 'providers/plainbox-provider-checkbox/jobs/piglit.txt.in'
--- providers/plainbox-provider-checkbox/jobs/piglit.txt.in	2014-06-19 17:00:52 +0000
+++ providers/plainbox-provider-checkbox/jobs/piglit.txt.in	1970-01-01 00:00:00 +0000
@@ -1,81 +0,0 @@
-plugin: shell
-id: piglit/fbo
-requires:
- package.name == 'piglit'
-command: piglit_test -t ^spec/EXT_framebuffer_object -n fbo
-estimated_duration: 28.000
-_description:
- Runs piglit tests for checking support for framebuffer object operations, depth buffer and stencil buffer
-
-plugin: shell
-id: piglit/gl-2.1
-requires:
- package.name == 'piglit'
-command: piglit_test -t spec/'!OpenGL 2.1'/ -n gl-2.1
-estimated_duration: 2.500
-_description:
- Runs piglit tests for checking OpenGL 2.1 support
-
-plugin: shell
-id: piglit/vbo
-requires:
- package.name == 'piglit'
-command: piglit_test -t spec/ARB_vertex_buffer_object/ -n vbo
-estimated_duration: 0.430
-_description:
- Runs piglit tests for checking support for vertex buffer object operations
-
-plugin: shell
-id: piglit/glsl-fragment-shader
-requires:
- package.name == 'piglit'
-command: piglit_test -t ^shaders/glsl-arb-fragment -n glsl-fragment-shader
-estimated_duration: 2.700
-_description:
- Runs piglit tests for checking support for GLSL fragment shader operations
-
-plugin: shell
-id: piglit/glsl-vertex-shader
-requires:
- package.name == 'piglit'
-command: piglit_test -t ^shaders/glsl-clamp-vertex-color -t ^shaders/glsl-max-vertex-attrib -t ^shaders/glsl-novertexdata -n glsl-vertex-shader
-estimated_duration: 3.200
-_description:
- Runs piglit tests for checking support for GLSL vertex shader operations
-
-plugin: shell
-id: piglit/glx-tfp
-requires:
- package.name == 'piglit'
-command: piglit_test -t glx-tfp -n glx-tfp
-estimated_duration: 2.600
-_description:
- Runs piglit tests for checking support for texture from pixmap
-
-plugin: shell
-id: piglit/stencil_buffer
-requires:
- package.name == 'piglit'
-command: piglit_test -t glx-visuals-stencil -t readpixels-24_8 -n stencil_buffer
-estimated_duration: 30.000
-_description:
- Runs piglit_tests for checking support for stencil buffer operations
-
-plugin: shell
-id: piglit/summarize_results
-requires:
- package.name == 'piglit'
-command: [ -e $PLAINBOX_SESSION_SHARE/piglit-results ] && piglit-summary-html.py $PLAINBOX_SESSION_SHARE/piglit-summary/ `find $PLAINBOX_SESSION_SHARE/piglit-results/ -name main` && echo "Successfully summarized piglit results. They are available in $PLAINBOX_SESSION_SHARE/piglit-sumary/"
-estimated_duration: 1.380
-_description:
- Runs the piglit results summarizing tool
-
-plugin: shell
-id: piglit/tarball
-requires:
- package.name == 'piglit'
-depends: piglit/summarize_results
-command: [ -e $PLAINBOX_SESSION_SHARE/piglit-summary ] && tar cfz $PLAINBOX_SESSION_SHARE/piglit-results.tar.gz $PLAINBOX_SESSION_SHARE/piglit-summary/
-_description:
- Archives the piglit-summary directory into the piglit-results.tar.gz.
-

=== modified file 'providers/plainbox-provider-checkbox/po/POTFILES.in'
--- providers/plainbox-provider-checkbox/po/POTFILES.in	2014-06-11 15:29:20 +0000
+++ providers/plainbox-provider-checkbox/po/POTFILES.in	2015-03-31 13:34:54 +0000
@@ -33,7 +33,6 @@
 [type: gettext/rfc822deb] jobs/panel_clock_test.txt.in
 [type: gettext/rfc822deb] jobs/panel_reboot.txt.in
 [type: gettext/rfc822deb] jobs/peripheral.txt.in
-[type: gettext/rfc822deb] jobs/piglit.txt.in
 [type: gettext/rfc822deb] jobs/power-management.txt.in
 [type: gettext/rfc822deb] jobs/rendercheck.txt.in
 [type: gettext/rfc822deb] jobs/server-services.txt.in
@@ -112,7 +111,6 @@
 [type: gettext/python] bin/optical_detect
 [type: gettext/python] bin/optical_read_test
 bin/optical_write_test
-[type: gettext/python] bin/piglit_test
 [type: gettext/python] bin/pm_log_check
 [type: gettext/python] bin/pm_test
 [type: gettext/python] bin/process_wait

=== modified file 'providers/plainbox-provider-checkbox/po/plainbox-provider-checkbox.pot'
--- providers/plainbox-provider-checkbox/po/plainbox-provider-checkbox.pot	2014-12-03 13:42:52 +0000
+++ providers/plainbox-provider-checkbox/po/plainbox-provider-checkbox.pot	2015-03-31 13:34:54 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-03 14:39+0100\n"
+"POT-Creation-Date: 2015-03-31 15:25+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -778,7 +778,7 @@
 
 #. summary
 #: ../jobs/disk.txt.in:18
-msgid "Disk statistics for {attr_DEVNAME}"
+msgid "Disk statistics for /dev/{name}"
 msgstr ""
 
 #. description
@@ -797,37 +797,35 @@
 #. description
 #: ../jobs/disk.txt.in:19
 msgid ""
-"    product vendor: {attr_ID_VENDOR}\n"
-"    product name: {attr_ID_MODEL}\n"
-"    serial number: {attr_ID_SERIAL_SHORT}\n"
+"    product name: {product}\n"
 "    sysfs path: {path}\n"
-"    device node path: {attr_DEVNAME}"
+"    device node path: /dev/{name}"
 msgstr ""
 
 #. description
-#: ../jobs/disk.txt.in:37
+#: ../jobs/disk.txt.in:35
 msgid "Check stats changes for each disk"
 msgstr ""
 
 #. description
-#: ../jobs/disk.txt.in:58
+#: ../jobs/disk.txt.in:56
 msgid "SMART test"
 msgstr ""
 
 #. description
-#: ../jobs/disk.txt.in:78
+#: ../jobs/disk.txt.in:76
 msgid "Verify system storage performs at or above baseline performance"
 msgstr ""
 
 #. description
-#: ../jobs/disk.txt.in:98
+#: ../jobs/disk.txt.in:96
 msgid ""
 "Verify that storage devices, such as Fibre Channel and RAID can be detected "
 "and perform under stress."
 msgstr ""
 
 #. description
-#: ../jobs/disk.txt.in:120
+#: ../jobs/disk.txt.in:118
 msgid ""
 "Some new hard drives include a feature that parks the drive heads after a "
 "short period of inactivity. This is a power-saving feature, but it can have "
@@ -837,7 +835,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/disk.txt.in:132
+#: ../jobs/disk.txt.in:130
 msgid ""
 "PURPOSE:\n"
 " This test checks that a systems drive protection mechanism works properly.\n"
@@ -1274,6 +1272,28 @@
 msgid "Attaches the simple screen capture file"
 msgstr ""
 
+#. summary
+#: ../jobs/graphics.txt.in:563
+msgid "Obtains a simple screen capture of {product}"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:567
+msgid ""
+"Obtains a simple screen capture of {product} using gnome-screenshot if "
+"present"
+msgstr ""
+
+#. summary
+#: ../jobs/graphics.txt.in:575
+msgid "Attaches a simple screen capture of {product}"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:578
+msgid "Attaches the simple screen capture file of {product}"
+msgstr ""
+
 #. description
 #: ../jobs/hibernate.txt.in:17
 msgid ""
@@ -1471,6 +1491,11 @@
 msgstr ""
 
 #. description
+#: ../jobs/info.txt.in:248
+msgid "Attaches the debug log from the virtualization run"
+msgstr ""
+
+#. description
 #: ../jobs/input.txt.in:7
 msgid "Pointing device tests."
 msgstr ""
@@ -2146,71 +2171,66 @@
 
 #. description
 #: ../jobs/local.txt.in:234
-msgid "Piglit tests"
+msgid "Power Management tests"
 msgstr ""
 
 #. description
 #: ../jobs/local.txt.in:241
-msgid "Power Management tests"
+msgid "Server Services checks"
 msgstr ""
 
 #. description
 #: ../jobs/local.txt.in:248
-msgid "Server Services checks"
+msgid "Suspend tests"
 msgstr ""
 
 #. description
 #: ../jobs/local.txt.in:255
-msgid "Suspend tests"
+msgid "Touchpad tests"
 msgstr ""
 
 #. description
 #: ../jobs/local.txt.in:262
-msgid "Touchpad tests"
+msgid "Touchscreen tests"
 msgstr ""
 
 #. description
 #: ../jobs/local.txt.in:269
-msgid "Touchscreen tests"
+msgid "USB tests"
 msgstr ""
 
 #. description
 #: ../jobs/local.txt.in:276
-msgid "USB tests"
+msgid "User Applications"
 msgstr ""
 
 #. description
 #: ../jobs/local.txt.in:283
-msgid "User Applications"
+msgid "Virtualization tests"
 msgstr ""
 
 #. description
 #: ../jobs/local.txt.in:290
-msgid "Virtualization tests"
+msgid "Wireless networking tests"
 msgstr ""
 
 #. description
 #: ../jobs/local.txt.in:297
-msgid "Wireless networking tests"
+msgid "Mobile broadband tests"
 msgstr ""
 
 #. description
 #: ../jobs/local.txt.in:304
-msgid "Mobile broadband tests"
+msgid "Stress tests"
 msgstr ""
 
 #. description
 #: ../jobs/local.txt.in:311
-msgid "Stress tests"
+msgid "Smoke tests"
 msgstr ""
 
 #. description
 #: ../jobs/local.txt.in:318
-msgid "Smoke tests"
-msgstr ""
-
-#. description
-#: ../jobs/local.txt.in:325
 msgid "Sniff Sniffers"
 msgstr ""
 
@@ -3178,56 +3198,6 @@
 msgstr ""
 
 #. description
-#: ../jobs/piglit.txt.in:7
-msgid ""
-"Runs piglit tests for checking support for framebuffer object operations, "
-"depth buffer and stencil buffer"
-msgstr ""
-
-#. description
-#: ../jobs/piglit.txt.in:16
-msgid "Runs piglit tests for checking OpenGL 2.1 support"
-msgstr ""
-
-#. description
-#: ../jobs/piglit.txt.in:25
-msgid ""
-"Runs piglit tests for checking support for vertex buffer object operations"
-msgstr ""
-
-#. description
-#: ../jobs/piglit.txt.in:34
-msgid ""
-"Runs piglit tests for checking support for GLSL fragment shader operations"
-msgstr ""
-
-#. description
-#: ../jobs/piglit.txt.in:43
-msgid ""
-"Runs piglit tests for checking support for GLSL vertex shader operations"
-msgstr ""
-
-#. description
-#: ../jobs/piglit.txt.in:52
-msgid "Runs piglit tests for checking support for texture from pixmap"
-msgstr ""
-
-#. description
-#: ../jobs/piglit.txt.in:61
-msgid "Runs piglit_tests for checking support for stencil buffer operations"
-msgstr ""
-
-#. description
-#: ../jobs/piglit.txt.in:70
-msgid "Runs the piglit results summarizing tool"
-msgstr ""
-
-#. description
-#: ../jobs/piglit.txt.in:79
-msgid "Archives the piglit-summary directory into the piglit-results.tar.gz."
-msgstr ""
-
-#. description
 #: ../jobs/power-management.txt.in:4
 msgid ""
 "PURPOSE:\n"
@@ -3251,7 +3221,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/power-management.txt.in:43
+#: ../jobs/power-management.txt.in:44
 msgid ""
 "PURPOSE:\n"
 " This test will check the system's ability to power-off and boot.\n"
@@ -3269,14 +3239,14 @@
 msgstr ""
 
 #. description
-#: ../jobs/power-management.txt.in:60
+#: ../jobs/power-management.txt.in:61
 msgid ""
 "This will attach any logs from the power-management/poweroff test to the "
 "results."
 msgstr ""
 
 #. description
-#: ../jobs/power-management.txt.in:72
+#: ../jobs/power-management.txt.in:74
 msgid ""
 "PURPOSE:\n"
 " This test will check the system's ability to reboot cleanly.\n"
@@ -3292,14 +3262,14 @@
 msgstr ""
 
 #. description
-#: ../jobs/power-management.txt.in:87
+#: ../jobs/power-management.txt.in:89
 msgid ""
 "This will attach any logs from the power-management/reboot test to the "
 "results."
 msgstr ""
 
 #. description
-#: ../jobs/power-management.txt.in:94
+#: ../jobs/power-management.txt.in:96
 msgid ""
 "PURPOSE:\n"
 "    This test will check your lid sensors.\n"
@@ -3310,7 +3280,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/power-management.txt.in:112
+#: ../jobs/power-management.txt.in:114
 msgid ""
 "PURPOSE:\n"
 "    This test will check your lid sensors\n"
@@ -3322,7 +3292,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/power-management.txt.in:131
+#: ../jobs/power-management.txt.in:133
 msgid ""
 "PURPOSE:\n"
 "    This test will check your lid sensors.\n"
@@ -3336,20 +3306,20 @@
 msgstr ""
 
 #. description
-#: ../jobs/power-management.txt.in:151
+#: ../jobs/power-management.txt.in:153
 msgid ""
 "Verify that the Real-time clock (RTC) device functions properly, if present"
 msgstr ""
 
 #. description
-#: ../jobs/power-management.txt.in:158
+#: ../jobs/power-management.txt.in:160
 msgid ""
 "Check to see if CONFIG_NO_HZ is set in the kernel (this is just a simple "
 "regression check)"
 msgstr ""
 
 #. description
-#: ../jobs/power-management.txt.in:165
+#: ../jobs/power-management.txt.in:167
 msgid ""
 "PURPOSE:\n"
 "    This test will ensure that the AC is unplugged for the battery drain "
@@ -3361,37 +3331,37 @@
 msgstr ""
 
 #. description
-#: ../jobs/power-management.txt.in:178
+#: ../jobs/power-management.txt.in:180
 msgid "Checks the battery drain during idle.  Reports time until empty"
 msgstr ""
 
 #. description
-#: ../jobs/power-management.txt.in:178
+#: ../jobs/power-management.txt.in:180
 msgid "and capacity as well."
 msgstr ""
 
 #. description
-#: ../jobs/power-management.txt.in:189
+#: ../jobs/power-management.txt.in:191
 msgid "Checks the battery drain while watching a movie.  Reports time"
 msgstr ""
 
 #. description
-#: ../jobs/power-management.txt.in:189
+#: ../jobs/power-management.txt.in:191
 msgid "until empty and capacity as well.  Requires MOVIE_VAR to be set."
 msgstr ""
 
 #. description
-#: ../jobs/power-management.txt.in:202
+#: ../jobs/power-management.txt.in:204
 msgid "Checks the battery drain during suspend.  Reports time until"
 msgstr ""
 
 #. description
-#: ../jobs/power-management.txt.in:202
+#: ../jobs/power-management.txt.in:204
 msgid "empty and capacity as well."
 msgstr ""
 
 #. description
-#: ../jobs/power-management.txt.in:211
+#: ../jobs/power-management.txt.in:213
 msgid ""
 "PURPOSE:\n"
 "    This test will ensure that the AC is plugged back in after the battery.\n"
@@ -3403,7 +3373,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/power-management.txt.in:225
+#: ../jobs/power-management.txt.in:227
 msgid ""
 "PURPOSE:\n"
 "    This test will verify that your system can successfully reboot.\n"
@@ -3421,7 +3391,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/power-management.txt.in:244
+#: ../jobs/power-management.txt.in:246
 msgid ""
 "PURPOSE:\n"
 "    This test will check your system shutdown/booting cycle\n"
@@ -3635,67 +3605,67 @@
 msgstr ""
 
 #. description
-#: ../jobs/stress.txt.in:158
+#: ../jobs/stress.txt.in:159
 msgid "Stress reboot system (100 cycles)"
 msgstr ""
 
 #. description
-#: ../jobs/stress.txt.in:176
+#: ../jobs/stress.txt.in:178
 msgid "Stress reboot system (30 cycles)"
 msgstr ""
 
 #. description
-#: ../jobs/stress.txt.in:193
+#: ../jobs/stress.txt.in:196
 msgid "Stress poweroff system (100 cycles)"
 msgstr ""
 
 #. description
-#: ../jobs/stress.txt.in:211
+#: ../jobs/stress.txt.in:215
 msgid "Stress poweroff system (30 cycles)"
 msgstr ""
 
 #. description
-#: ../jobs/stress.txt.in:224
+#: ../jobs/stress.txt.in:228
 msgid "Check logs for the stress reboot (30 cycles) test case"
 msgstr ""
 
 #. description
-#: ../jobs/stress.txt.in:238
+#: ../jobs/stress.txt.in:242
 msgid "Check logs for the stress poweroff (30 cycles) test case"
 msgstr ""
 
 #. description
-#: ../jobs/stress.txt.in:252
+#: ../jobs/stress.txt.in:256
 msgid "Check logs for the stress reboot (100 cycles) test case"
 msgstr ""
 
 #. description
-#: ../jobs/stress.txt.in:266
+#: ../jobs/stress.txt.in:270
 msgid "Check logs for the stress poweroff (100 cycles) test case"
 msgstr ""
 
 #. description
-#: ../jobs/stress.txt.in:283
+#: ../jobs/stress.txt.in:287
 msgid "Run the graphics stress test. This test can take a few minutes."
 msgstr ""
 
 #. description
-#: ../jobs/stress.txt.in:292
+#: ../jobs/stress.txt.in:296
 msgid "Attaches the graphics stress results to the submission."
 msgstr ""
 
 #. description
-#: ../jobs/stress.txt.in:299
+#: ../jobs/stress.txt.in:303
 msgid "Runs a test that transfers 100 10MB files 3 times to usb."
 msgstr ""
 
 #. summary
-#: ../jobs/stress.txt.in:304
+#: ../jobs/stress.txt.in:308
 msgid "Stress test for SDHC card"
 msgstr ""
 
 #. description
-#: ../jobs/stress.txt.in:307
+#: ../jobs/stress.txt.in:311
 msgid ""
 "PURPOSE:\n"
 "    This test will transfers 100 10MB files 3 times to a SDHC card, to\n"
@@ -3711,12 +3681,12 @@
 msgstr ""
 
 #. description
-#: ../jobs/stress.txt.in:326
+#: ../jobs/stress.txt.in:330
 msgid "Ping ubuntu.com and restart network interfaces 100 times"
 msgstr ""
 
 #. description
-#: ../jobs/stress.txt.in:338
+#: ../jobs/stress.txt.in:342
 msgid ""
 "PURPOSE:\n"
 "    To make sure that stressing the wifi hotkey does not cause applets to "
@@ -5205,6 +5175,11 @@
 msgstr ""
 
 #. description
+#: ../jobs/touchpad.txt.in:205
+msgid "This test will check if your touchpad was detected as a mouse."
+msgstr ""
+
+#. description
 #: ../jobs/touchscreen.txt.in:7
 msgid ""
 "Determine whether the screen is detected as a non-touch device automatically."
@@ -5221,11 +5196,12 @@
 #: ../jobs/touchscreen.txt.in:23
 msgid ""
 "PURPOSE:\n"
-"    Touchscreen manual detection of multitouch.\n"
+"    Touchscreen capability manual detection.\n"
 "STEPS:\n"
 "    1. Look at the specifications for your system.\n"
 "VERIFICATION:\n"
-"    Is the screen supposed to be multitouch?"
+"    Your screen was detected as a non touch screen. Select PASS if this is "
+"correct."
 msgstr ""
 
 #. description

=== modified file 'providers/plainbox-provider-piglit/manage.py'
--- providers/plainbox-provider-piglit/manage.py	2015-03-24 14:51:33 +0000
+++ providers/plainbox-provider-piglit/manage.py	2015-03-31 13:34:54 +0000
@@ -21,7 +21,7 @@
 
 setup(
     name='2013.com.canonical.certification:piglit',
-    version="0.1",
+    version="0.2",
     description=N_("Piglit (OpenGL/OpenCL) Test Provider"),
     gettext_domain='plainbox-provider-piglit',
 )

=== modified file 'providers/plainbox-provider-piglit/po/pl.po'
--- providers/plainbox-provider-piglit/po/pl.po	2015-03-31 05:09:02 +0000
+++ providers/plainbox-provider-piglit/po/pl.po	2015-03-31 13:34:54 +0000
@@ -7,10 +7,11 @@
 msgstr ""
 "Project-Id-Version: plainbox-provider-piglit 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-23 19:37+0100\n"
+"POT-Creation-Date: 2015-03-31 15:28+0200\n"
 "PO-Revision-Date: 2015-03-31 01:06+0000\n"
 "Last-Translator: Zygmunt Krynicki <[e-mail]>\n"
 "Language-Team: polski <>\n"
+"Language: Polish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,96 +19,95 @@
 "|| n%100>=20) ? 1 : 2;\n"
 "X-Launchpad-Export-Date: 2015-03-31 05:09+0000\n"
 "X-Generator: Launchpad (build 17413)\n"
-"Language: Polish\n"
 
 #. summary
-#: ../units/piglit.pxu:3
+#: ../units/piglit.pxu:4
 msgid "Run piglit tests for Frame Buffer Object (FBO) operations"
 msgstr "Uruchom testy piglita dla operacji na buforach ramki (FBO)"
 
 #. description
-#: ../units/piglit.pxu:4
+#: ../units/piglit.pxu:5
 msgid ""
 "This job runs piglit tests for checking support for frame buffer object "
 "operations, depth buffer and stencil buffer."
 msgstr ""
 
 #. summary
-#: ../units/piglit.pxu:19
+#: ../units/piglit.pxu:21
 msgid "Run piglit tests for OpenGL 2.1"
 msgstr "Uruchom testy piglita dla OpenGL 2.1"
 
 #. description
-#: ../units/piglit.pxu:20
+#: ../units/piglit.pxu:22
 msgid "This job runs piglit tests for checking OpenGL 2.1 support."
 msgstr ""
 
 #. summary
-#: ../units/piglit.pxu:34
+#: ../units/piglit.pxu:37
 msgid "Run piglit tests for Vertex Buffer Object (VBO) operations"
 msgstr "Uruchom testy piglita dla operacji na buforach geometrii (VBO)"
 
 #. description
-#: ../units/piglit.pxu:35
+#: ../units/piglit.pxu:38
 msgid ""
 "This job runs piglit tests for checking support for vertex buffer object "
 "operations."
 msgstr ""
 
 #. summary
-#: ../units/piglit.pxu:50
+#: ../units/piglit.pxu:54
 msgid "Run piglit tests for GLSL fragment shader operations"
 msgstr "Uruchom testy piglita dla operacji GLSL cieniowania pikseli"
 
 #. description
-#: ../units/piglit.pxu:51
+#: ../units/piglit.pxu:55
 msgid ""
 "This job runs piglit tests for checking support for GLSL fragment shader "
 "operations."
 msgstr ""
 
 #. summary
-#: ../units/piglit.pxu:66
+#: ../units/piglit.pxu:71
 msgid "Run piglit tests for GLSL vertex shader operations"
 msgstr "Uruchom testy piglita dla operacji GLSL cieniowania wierzchołków"
 
 #. description
-#: ../units/piglit.pxu:67
+#: ../units/piglit.pxu:72
 msgid ""
 "This job runs piglit tests for checking support for GLSL vertex shader "
 "operations."
 msgstr ""
 
 #. summary
-#: ../units/piglit.pxu:84
+#: ../units/piglit.pxu:90
 msgid "Run piglit tests for texture-from-pixmap extension"
 msgstr "Uruchom testy piglita dla rozszerzenia tekstura-z-piksmapy"
 
 #. description
-#: ../units/piglit.pxu:85
+#: ../units/piglit.pxu:91
 msgid ""
 "This job runs piglit tests for checking support for texture from pixmap."
 msgstr ""
 
 #. summary
-#: ../units/piglit.pxu:99
+#: ../units/piglit.pxu:106
 msgid "Run piglit tests for stencil buffer operations"
 msgstr "Uruchom testy piglita dla operacji na buforach szablonowych"
 
 #. description
-#: ../units/piglit.pxu:100
+#: ../units/piglit.pxu:107
 msgid ""
 "This job runs piglit tests for checking support for stencil buffer "
 "operations."
 msgstr ""
 
 #. summary
-#: ../units/piglit.pxu:115
+#: ../units/piglit.pxu:123
 msgid "Combine all piglit test results into one"
 msgstr "Połącz wszystkie wyniki testów piglita w jeden"
 
 #. description
-#: ../units/piglit.pxu:116
+#: ../units/piglit.pxu:124
 msgid ""
 "This job combines all of the prior piglit results into one result file so "
 "that they can be analyzed together. It is required to use piglit's built-in "
@@ -115,24 +115,24 @@
 msgstr ""
 
 #. summary
-#: ../units/piglit.pxu:131
+#: ../units/piglit.pxu:140
 msgid "Create a HTML summary of all the piglit test results"
-msgstr "Utwórz HTML'owe podsumowanie wyników testów piglita"
+msgstr "Utwórz HTML'owe podsumowanie wyników testów programu piglit"
 
 #. description
-#: ../units/piglit.pxu:132
+#: ../units/piglit.pxu:141
 msgid ""
 "This job runs the piglit HTML report generator on the combination of all the "
 "past results."
 msgstr ""
 
 #. summary
-#: ../units/piglit.pxu:147
+#: ../units/piglit.pxu:159
 msgid "Archive HTML summary of all piglit test results"
-msgstr "Zarchiwizuj HTML'owe podsumowanie wyników testów piglita"
+msgstr "Zarchiwizuj HTML'owe podsumowanie wyników testów programu piglit"
 
 #. description
-#: ../units/piglit.pxu:148
+#: ../units/piglit.pxu:160
 msgid ""
 "This job archives the HTML summary of all the piglit results for convenient "
 "access. The result is not added as an attachment but can be loaded from the "
@@ -140,12 +140,12 @@
 msgstr ""
 
 #. name
-#: ../units/piglit.pxu:165
+#: ../units/piglit.pxu:177
 msgid "All piglit tests (tarball)"
-msgstr "Wszystkie testy piglita (tarball)"
+msgstr "Wszystkie testy programu piglit (tarball)"
 
 #. description
-#: ../units/piglit.pxu:166
+#: ../units/piglit.pxu:178
 msgid ""
 "This test plan runs all of the piglit jobs, summarizes them and creates an "
 "archive for easy inspection and sharing."
@@ -153,6 +153,11 @@
 "Ten plan testów wykonuje wszystkie zadania piglita, tworzy podsumowanie oraz "
 "archiwum które ułatwia analizę oraz współdzielenie danych."
 
+#. description
+#: ../units/piglit.pxu:190
+msgid "Piglit Tests"
+msgstr "Testy programu Piglit"
+
 #: ../bin/piglit-wrapper:100
 #, c-format
 msgid "Created temporary directory: %s"
@@ -164,7 +169,7 @@
 
 #: ../bin/piglit-wrapper:130
 msgid "Piglit didn't create the test result file?"
-msgstr "Czy piglit nie utworzył katalogu z wynikami testów?"
+msgstr "Czyżby piglit nie utworzył katalogu z wynikami testów?"
 
 #: ../bin/piglit-wrapper:132
 #, c-format
@@ -259,7 +264,7 @@
 #: ../bin/piglit-combiner:188
 #, c-format
 msgid "Unable to combine results: %s"
-msgstr ""
+msgstr "Nie można złączyć wyników: %s"
 
 #: ../bin/piglit-combiner:192
 #, c-format

=== modified file 'providers/plainbox-provider-piglit/po/plainbox-provider-piglit.pot'
--- providers/plainbox-provider-piglit/po/plainbox-provider-piglit.pot	2015-03-24 14:51:33 +0000
+++ providers/plainbox-provider-piglit/po/plainbox-provider-piglit.pot	2015-03-31 13:34:54 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-23 19:37+0100\n"
+"POT-Creation-Date: 2015-03-31 15:28+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -19,93 +19,93 @@
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #. summary
-#: ../units/piglit.pxu:3
+#: ../units/piglit.pxu:4
 msgid "Run piglit tests for Frame Buffer Object (FBO) operations"
 msgstr ""
 
 #. description
-#: ../units/piglit.pxu:4
+#: ../units/piglit.pxu:5
 msgid ""
 "This job runs piglit tests for checking support for frame buffer object "
 "operations, depth buffer and stencil buffer."
 msgstr ""
 
 #. summary
-#: ../units/piglit.pxu:19
+#: ../units/piglit.pxu:21
 msgid "Run piglit tests for OpenGL 2.1"
 msgstr ""
 
 #. description
-#: ../units/piglit.pxu:20
+#: ../units/piglit.pxu:22
 msgid "This job runs piglit tests for checking OpenGL 2.1 support."
 msgstr ""
 
 #. summary
-#: ../units/piglit.pxu:34
+#: ../units/piglit.pxu:37
 msgid "Run piglit tests for Vertex Buffer Object (VBO) operations"
 msgstr ""
 
 #. description
-#: ../units/piglit.pxu:35
+#: ../units/piglit.pxu:38
 msgid ""
 "This job runs piglit tests for checking support for vertex buffer object "
 "operations."
 msgstr ""
 
 #. summary
-#: ../units/piglit.pxu:50
+#: ../units/piglit.pxu:54
 msgid "Run piglit tests for GLSL fragment shader operations"
 msgstr ""
 
 #. description
-#: ../units/piglit.pxu:51
+#: ../units/piglit.pxu:55
 msgid ""
 "This job runs piglit tests for checking support for GLSL fragment shader "
 "operations."
 msgstr ""
 
 #. summary
-#: ../units/piglit.pxu:66
+#: ../units/piglit.pxu:71
 msgid "Run piglit tests for GLSL vertex shader operations"
 msgstr ""
 
 #. description
-#: ../units/piglit.pxu:67
+#: ../units/piglit.pxu:72
 msgid ""
 "This job runs piglit tests for checking support for GLSL vertex shader "
 "operations."
 msgstr ""
 
 #. summary
-#: ../units/piglit.pxu:84
+#: ../units/piglit.pxu:90
 msgid "Run piglit tests for texture-from-pixmap extension"
 msgstr ""
 
 #. description
-#: ../units/piglit.pxu:85
+#: ../units/piglit.pxu:91
 msgid ""
 "This job runs piglit tests for checking support for texture from pixmap."
 msgstr ""
 
 #. summary
-#: ../units/piglit.pxu:99
+#: ../units/piglit.pxu:106
 msgid "Run piglit tests for stencil buffer operations"
 msgstr ""
 
 #. description
-#: ../units/piglit.pxu:100
+#: ../units/piglit.pxu:107
 msgid ""
 "This job runs piglit tests for checking support for stencil buffer "
 "operations."
 msgstr ""
 
 #. summary
-#: ../units/piglit.pxu:115
+#: ../units/piglit.pxu:123
 msgid "Combine all piglit test results into one"
 msgstr ""
 
 #. description
-#: ../units/piglit.pxu:116
+#: ../units/piglit.pxu:124
 msgid ""
 "This job combines all of the prior piglit results into one result file so "
 "that they can be analyzed together. It is required to use piglit's built-in "
@@ -113,24 +113,24 @@
 msgstr ""
 
 #. summary
-#: ../units/piglit.pxu:131
+#: ../units/piglit.pxu:140
 msgid "Create a HTML summary of all the piglit test results"
 msgstr ""
 
 #. description
-#: ../units/piglit.pxu:132
+#: ../units/piglit.pxu:141
 msgid ""
 "This job runs the piglit HTML report generator on the combination of all the "
 "past results."
 msgstr ""
 
 #. summary
-#: ../units/piglit.pxu:147
+#: ../units/piglit.pxu:159
 msgid "Archive HTML summary of all piglit test results"
 msgstr ""
 
 #. description
-#: ../units/piglit.pxu:148
+#: ../units/piglit.pxu:160
 msgid ""
 "This job archives the HTML summary of all the piglit results for convenient "
 "access. The result is not added as an attachment but can be loaded from the "
@@ -138,17 +138,22 @@
 msgstr ""
 
 #. name
-#: ../units/piglit.pxu:165
+#: ../units/piglit.pxu:177
 msgid "All piglit tests (tarball)"
 msgstr ""
 
 #. description
-#: ../units/piglit.pxu:166
+#: ../units/piglit.pxu:178
 msgid ""
 "This test plan runs all of the piglit jobs, summarizes them and creates an "
 "archive for easy inspection and sharing."
 msgstr ""
 
+#. description
+#: ../units/piglit.pxu:190
+msgid "Piglit Tests"
+msgstr ""
+
 #: ../bin/piglit-wrapper:100
 #, c-format
 msgid "Created temporary directory: %s"

=== modified file 'providers/plainbox-provider-piglit/units/piglit.pxu'
--- providers/plainbox-provider-piglit/units/piglit.pxu	2015-03-24 14:51:33 +0000
+++ providers/plainbox-provider-piglit/units/piglit.pxu	2015-03-31 13:34:54 +0000
@@ -182,3 +182,15 @@
  piglit/test/.*
  piglit/support/tarball
 estimated_duration: 46
+
+unit: job
+id: __piglit__
+category_id: 2013.com.canonical.plainbox::graphics
+_summary: Piglit Tests
+_description: Piglit Tests
+plugin: local
+command:
+  shopt -s extglob
+  cat $PLAINBOX_PROVIDER_UNITS/piglit.pxu
+estimated_duration: 1
+flags: preserve-locale