Merge lp:~zyga/checkbox/piglit-guacamole into lp:checkbox

[Zygmunt Krynicki]

Hey. I'm looking for feedback on guacamolization of the trivial piglit provider that has three commands. Have a look.

cc9bc98 providers:piglit: add packaging meta-data
0be339c providers:piglit: correct logger namespace for piglit-archiver
2299697 providers:piglit: add dependency on guacamole
1e2c4e3 providers:piglit: convert piglit-archiver to use guacamole
616643c providers:piglit: convert piglit-combiner to use guacamole
449fcdd providers:piglit: convert piglit-wrapper to use guacamole
bd47529 providers:piglit: refresh translation template
dbc56ad providers:piglit: update Polish translations

One of the things I didn't do (feedback welcome) is to combine all three scripts together (easier code reuse). It's pretty easy with guacamole but I didn't take that step. Tell me what you think.

[Daniel Manrique (roadmr)]

Something's wrong with the guacamolized version :(

e.g. the archiver command should do something like this:

$ providers/plainbox-provider-piglit/bin/piglit-archiver -n bogus -r /tmp/tools-vivid -b /tmp/tools-vivid --verbose
piglit-combiner:INFO: Creating tar archive
Archive with summary of piglit results is available in
/src/checkbox/bzr/trunk/bogus.tar.gz

I installed guacamole in an active venv:

$ pip list
guacamole (0.8)
pip (1.5.4)
setuptools (2.2)

Calling the guacamolized piglit-archiver says this:

$ providers/plainbox-provider-piglit/bin/piglit-archiver -n bogus -r /tmp -b /tmp --verbose
usage: piglit-archiver [-h]
piglit-archiver: error: unrecognized arguments: -n

Maybe the piglit provider doesn't benefit much from guacamole? it doesn't seem to (yet) use any of the fancy features and looking at the code it essentially does the same (but with more code - that's what jumps to me but I realize that "it's actually more code" is not the best way to judge a refactoring).

I wonder if this is preparation for the future, in which case it would be OK to me (we just need to fix the problem I showed above).

review: Needs Fixing

[Zygmunt Krynicki (zyga)]

Thanks for having a look.

I may have made a mistake in the archive command, I just automatically
ripped the main code in two to get stuff into a Command class.
For reference, guacamole is now in the checkbox-dev PPA so you can
just apt-get install it from there.

As for the code size I think it's actually the opposite. All of the
stuff we have in clitools in plainbox today finds its way into
guacamole. All of the stock setup, teardown, logging, debugging, i18n,
man pages, etc. This gives consistent experience in all the little
scripts (and hopefully makes them better as some don't even respect
--help today). The goal with guacamole is to provide consistent,
high-quality base for command line apps. Code size can only increase
if the original application didn't care about many of those things
(and the piglit provider was actually written semi-sloppily, expecting
to be converted to guacamole later as a guinea pig). This also
explains why it's being done. It's one of the smallest (or the
smallest) self-contained codebase that can be experimented on.

It is definitely a preparation for the future, both in figuring out
API quirks in guacamole now and in missing features that I didn't
notice while coding it.

I'll look at the piglit-archiver issue and post a follow-up shortly.

Thanks
ZK

On Wed, Apr 22, 2015 at 6:54 PM, Daniel Manrique
<email address hidden> wrote:
> Review: Needs Fixing
>
> Something's wrong with the guacamolized version :(
>
> e.g. the archiver command should do something like this:
>
> $ providers/plainbox-provider-piglit/bin/piglit-archiver -n bogus -r /tmp/tools-vivid -b /tmp/tools-vivid --verbose
> piglit-combiner:INFO: Creating tar archive
> Archive with summary of piglit results is available in
> /src/checkbox/bzr/trunk/bogus.tar.gz
>
> I installed guacamole in an active venv:
>
> $ pip list
> guacamole (0.8)
> pip (1.5.4)
> setuptools (2.2)
>
> Calling the guacamolized piglit-archiver says this:
>
> $ providers/plainbox-provider-piglit/bin/piglit-archiver -n bogus -r /tmp -b /tmp --verbose
> usage: piglit-archiver [-h]
> piglit-archiver: error: unrecognized arguments: -n
>
> Maybe the piglit provider doesn't benefit much from guacamole? it doesn't seem to (yet) use any of the fancy features and looking at the code it essentially does the same (but with more code - that's what jumps to me but I realize that "it's actually more code" is not the best way to judge a refactoring).
>
> I wonder if this is preparation for the future, in which case it would be OK to me (we just need to fix the problem I showed above).
> --
> https://code.launchpad.net/~zyga/checkbox/piglit-guacamole/+merge/257077
> You are the owner of lp:~zyga/checkbox/piglit-guacamole.

Unmerged revisions

3725. By Zygmunt Krynicki on 2015-04-22

providers:piglit: update Polish translations

Signed-off-by: Zygmunt Krynicki <email address hidden>

3724. By Zygmunt Krynicki on 2015-04-22

providers:piglit: refresh translation template

Signed-off-by: Zygmunt Krynicki <email address hidden>

3723. By Zygmunt Krynicki on 2015-04-22

providers:piglit: convert piglit-wrapper to use guacamole

This patch converts the big main() function to the WrapperCommand
class. This class has separate methods for describing command line
arguments and for doing its business. Guacamole provides the common glue
(and common features for debugging, logging, i18n and all the things).

As before, there's one more class that has common functionality that
cannot be shared just yet.

Signed-off-by: Zygmunt Krynicki <email address hidden>

3722. By Zygmunt Krynicki on 2015-04-22

providers:piglit: convert piglit-combiner to use guacamole

This patch converts the big main() function to the CombinerCommand
class. This class has separate methods for describing command line
arguments and for doing its business. Guacamole provides the common glue
(and common features for debugging, logging, i18n and all the things).

As before, there's one more class that has common functionality that
cannot be shared just yet.

Signed-off-by: Zygmunt Krynicki <email address hidden>

3721. By Zygmunt Krynicki on 2015-04-22

providers:piglit: convert piglit-archiver to use guacamole

This patch converts the big main() function to the ArchiverCommand
class. This class has separate methods for describing command line
arguments and for doing its business. Guacamole provides the common
glue (and common features for debugging, logging, i18n and all the
things).

I also split off one more class that handles i18n specific to plainbox.
This class can be shared later.

Signed-off-by: Zygmunt Krynicki <email address hidden>

3720. By Zygmunt Krynicki on 2015-04-22

providers:piglit: add dependency on guacamole

Signed-off-by: Zygmunt Krynicki <email address hidden>

3719. By Zygmunt Krynicki on 2015-04-22

providers:piglit: correct logger namespace for piglit-archiver

Signed-off-by: Zygmunt Krynicki <email address hidden>

3718. By Zygmunt Krynicki on 2015-04-22

providers:piglit: add packaging meta-data

Signed-off-by: Zygmunt Krynicki <email address hidden>

=== modified file 'providers/plainbox-provider-piglit/bin/piglit-archiver'
--- providers/plainbox-provider-piglit/bin/piglit-archiver	2015-03-24 14:51:33 +0000
+++ providers/plainbox-provider-piglit/bin/piglit-archiver	2015-04-22 13:03:51 +0000
@@ -17,52 +17,78 @@
 # You should have received a copy of the GNU General Public License
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 """ Tool for archiving piglit report.  """
-import argparse
 import gettext
 import logging
 import os
 import shutil
-import sys
+
+from guacamole import Command
 
 _ = gettext.gettext
 
-_logger = logging.getLogger("piglit-combiner")
-
-
-def main():
-    """ Main function. """
-    gettext.textdomain('plainbox-provider-piglit')
-    gettext.bindtextdomain('plainbox-provider-piglit',
-                           os.getenv('PLAINBOX_PROVIDER_LOCALE_DIR'))
-    parser = argparse.ArgumentParser(
-        description=_("Tool for archiving piglit report"))
-    parser.add_argument(
-        '-n', '--base-name', required=True,
-        help=_("base name of the archive"))
-    parser.add_argument(
-        '-f', '--format', choices=['zip', 'tar', 'gztar', 'bztar'],
-        default='gztar', help=_("format of the archive to create"))
-    parser.add_argument(
-        '-r', '--root-dir', required=True,
-        help=_("root directory of the archive"))
-    parser.add_argument(
-        '-b', '--base-dir', required=True,
-        help=_("root directory of the archive"))
-    parser.add_argument(
-        "--verbose", "-v",
-        action='store_true',
-        help=_("be more verbose"))
-    ns = parser.parse_args()
-    logging.basicConfig(
-        level=logging.INFO if ns.verbose else logging.WARNING,
-        format="{name}:{levelname}: {message}", style='{')
-    ns = parser.parse_args()
-    name = shutil.make_archive(
-        ns.base_name, ns.format, ns.root_dir, ns.base_dir, ns.verbose,
-        logger=_logger)
-    print(_("Archive with summary of piglit results is available in"))
-    print(name)
+_logger = logging.getLogger("piglit-archiver")
+
+
+class ProviderCommand(Command):
+
+    """Shared implementation of all provider-specific commands."""
+
+    def get_locale_dir(self):
+        """
+        Discover alternate locale directory.
+
+        This is an overridden guacamole method to take advantage of plainbox
+        supplying locale directory to each provider via the
+        ``PLAINBOX_PROVIDER_LOCALE_DIR``.
+        """
+        return os.getenv('PLAINBOX_PROVIDER_LOCALE_DIR')
+
+
+class ArchiverCommand(ProviderCommand):
+
+    """
+    Tool for archiving piglit report.
+
+    This tool can archive a HTML report generated by piglit.
+
+    @EPILOG@
+
+    The base name is used to derive the name of the final archive. It can
+    include the directory part. The root directory is the directory that
+    becomes the root of the archive. The base directory is the directory to
+    archive, relative to the root directory. The actual archive will contain
+    the base directory.
+    """
+
+    gettext_domain = 'plainbox-provider-piglit'
+
+    def invoked(self, ctx):
+        """Invoke the command."""
+        name = shutil.make_archive(
+            ctx.args.base_name, ctx.args.format, ctx.args.root_dir,
+            ctx.args.base_dir, ctx.args.verbose, logger=_logger)
+        print(_("Archive with summary of piglit results is available in"))
+        print(name)
+
+    def register_arguments(self, parser):
+        """Define command arguments."""
+        parser.add_argument(
+            '-n', '--base-name', required=True,
+            help=_("base name of the archive"))
+        parser.add_argument(
+            '-f', '--format', choices=['zip', 'tar', 'gztar', 'bztar'],
+            default='gztar', help=_("format of the archive to create"))
+        parser.add_argument(
+            '-r', '--root-dir', required=True,
+            help=_("root directory of the archive"))
+        parser.add_argument(
+            '-b', '--base-dir', required=True,
+            help=_("base directory of the archive"))
+        parser.add_argument(
+            "--verbose", "-v",
+            action='store_true',
+            help=_("be more verbose"))
 
 
 if __name__ == "__main__":
-    sys.exit(main())
+    ArchiverCommand().main()
 
=== modified file 'providers/plainbox-provider-piglit/bin/piglit-combiner'
--- providers/plainbox-provider-piglit/bin/piglit-combiner	2015-03-24 14:51:33 +0000
+++ providers/plainbox-provider-piglit/bin/piglit-combiner	2015-04-22 13:03:51 +0000
@@ -27,12 +27,12 @@
     This script was written to work with ``piglit-0~git20150312-530724b-1`` and
     may not work with older or more recent version.
 """
-import argparse
 import gettext
 import json
 import logging
 import os
-import sys
+
+from guacamole import Command
 
 _ = gettext.gettext
 
@@ -159,41 +159,60 @@
         return old_value
 
 
-def main():
-    """ Main function. """
-    gettext.textdomain('plainbox-provider-piglit')
-    gettext.bindtextdomain('plainbox-provider-piglit',
-                           os.getenv('PLAINBOX_PROVIDER_LOCALE_DIR'))
-    parser = argparse.ArgumentParser(
-        description=_(
-            "Tool for combining results of multiple runs of piglit"
-        ))
-    parser.add_argument(
-        '-i', '--input-dir', metavar=_("DIR"), required=True,
-        help=_("directory with results to load (recursively)"))
-    parser.add_argument(
-        "-o", "--output-dir", metavar=_("DIR"), required=True,
-        help=_("directory to save results to"))
-    parser.add_argument(
-        "--verbose", "-v",
-        action='store_true',
-        help=_("be more verbose"))
-    ns = parser.parse_args()
-    logging.basicConfig(
-        level=logging.INFO if ns.verbose else logging.WARNING,
-        format="{name}:{levelname}: {message}", style='{')
-    try:
-        count = combine_piglit_results(ns.input_dir, ns.output_dir)
-    except CombinationError as exc:
-        _logger.error(_("Unable to combine results: %s"), exc)
-        return 1
-    else:
-        _logger.info(gettext.ngettext(
-            "Combined %d result", "Combined %d results", count), count)
-        if count == 0:
-            _logger.warning(_("No results were really combined!"))
-            return 2
+class ProviderCommand(Command):
+
+    """Shared implementation of all provider-specific commands."""
+
+    def get_locale_dir(self):
+        """
+        Discover alternate locale directory.
+
+        This is an overridden guacamole method to take advantage of plainbox
+        supplying locale directory to each provider via the
+        ``PLAINBOX_PROVIDER_LOCALE_DIR``.
+        """
+        return os.getenv('PLAINBOX_PROVIDER_LOCALE_DIR')
+
+
+class CombinerCommand(ProviderCommand):
+
+    """
+    Tool for combining results of multiple runs of piglit.
+
+    This tool can combine multiple runs of piglit into one result file. It is
+    useful for preparing report from multiple separate test runs.
+    """
+
+    gettext_domain = 'plainbox-provider-piglit'
+
+    def invoked(self, ctx):
+        """Invoke the command."""
+        try:
+            count = combine_piglit_results(
+                ctx.args.input_dir, ctx.args.output_dir)
+        except CombinationError as exc:
+            _logger.error(_("Unable to combine results: %s"), exc)
+            return 1
+        else:
+            _logger.info(gettext.ngettext(
+                "Combined %d result", "Combined %d results", count), count)
+            if count == 0:
+                _logger.warning(_("No results were really combined!"))
+                return 2
+
+    def register_arguments(self, parser):
+        """Define command arguments."""
+        parser.add_argument(
+            '-i', '--input-dir', metavar=_("DIR"), required=True,
+            help=_("directory with results to load (recursively)"))
+        parser.add_argument(
+            "-o", "--output-dir", metavar=_("DIR"), required=True,
+            help=_("directory to save results to"))
+        parser.add_argument(
+            "--verbose", "-v",
+            action='store_true',
+            help=_("be more verbose"))
 
 
 if __name__ == "__main__":
-    sys.exit(main())
+    CombinerCommand().main()
 
=== modified file 'providers/plainbox-provider-piglit/bin/piglit-wrapper'
--- providers/plainbox-provider-piglit/bin/piglit-wrapper	2015-03-24 14:51:33 +0000
+++ providers/plainbox-provider-piglit/bin/piglit-wrapper	2015-04-22 13:03:51 +0000
@@ -26,16 +26,16 @@
     This script was written to work with ``piglit-0~git20150312-530724b-1`` and
     may not work with older or more recent version.
 """
-import argparse
 import collections
 import gettext
 import json
 import logging
 import os
 import subprocess
-import sys
 import tempfile
 
+from guacamole import Command
+
 _ = gettext.gettext
 
 _logger = logging.getLogger("piglit-wrapper")
@@ -151,46 +151,66 @@
             self._outcome_list[outcome].append(test_id)
 
 
-def main():
-    """ Main function. """
-    gettext.textdomain('plainbox-provider-piglit')
-    gettext.bindtextdomain('plainbox-provider-piglit',
-                           os.getenv('PLAINBOX_PROVIDER_LOCALE_DIR'))
-    parser = argparse.ArgumentParser(
-        description=_("Tool for running piglit tests"))
-    parser.add_argument(
-        '-d', '--dirname', metavar=_("DIR"), default=None,
-        help=_("save piglit results to DIR"))
-    parser.add_argument(
-        "--test", "-t", metavar=_("PATTERN"), required=True, action='append',
-        help=_("run piglit tests matching given PATTERN"))
-    parser.add_argument(
-        "--verbose", "-v",
-        action='store_true',
-        help=_("be more verbose during testing"))
-    ns = parser.parse_args()
-    logging.basicConfig(
-        level=logging.INFO if ns.verbose else logging.WARNING,
-        format="{name}:{levelname}: {message}", style='{')
-    piglit = PiglitWrapper(ns.test)
-    piglit.run(ns.dirname)
-    if not piglit.is_supported:
-        print(_("This version of piglit is not supported"))
-        return 2
-    stats = piglit.outcome_stats
-    print(_("Summary of results (by outcome)"))
-    for outcome in sorted(stats.keys()):
-        print(" - {}: {}".format(outcome, stats[outcome]))
-        if ns.verbose:
-            for test_id in sorted(piglit.outcome_list[outcome]):
-                print("   * {}".format(test_id))
-    if piglit.is_successful:
-        print(_("Tests successful"))
-        return 0
-    else:
-        print(_("Tests unsuccessful"))
-        return 1
+class ProviderCommand(Command):
+
+    """Shared implementation of all provider-specific commands."""
+
+    def get_locale_dir(self):
+        """
+        Discover alternate locale directory.
+
+        This is an overridden guacamole method to take advantage of plainbox
+        supplying locale directory to each provider via the
+        ``PLAINBOX_PROVIDER_LOCALE_DIR``.
+        """
+        return os.getenv('PLAINBOX_PROVIDER_LOCALE_DIR')
+
+
+class WrapperCommand(ProviderCommand):
+
+    """
+    Tool for running piglit in a controlled way.
+
+
+    Tool for running piglit tests.
+    """
+
+    gettext_domain = 'plainbox-provider-piglit'
+
+    def invoked(self, ctx):
+        """Invoke the command."""
+        piglit = PiglitWrapper(ctx.args.test)
+        piglit.run(ctx.args.dirname)
+        if not piglit.is_supported:
+            print(_("This version of piglit is not supported"))
+            return 2
+        stats = piglit.outcome_stats
+        print(_("Summary of results (by outcome)"))
+        for outcome in sorted(stats.keys()):
+            print(" - {}: {}".format(outcome, stats[outcome]))
+            if ctx.args.verbose:
+                for test_id in sorted(piglit.outcome_list[outcome]):
+                    print("   * {}".format(test_id))
+        if piglit.is_successful:
+            print(_("Tests successful"))
+            return 0
+        else:
+            print(_("Tests unsuccessful"))
+            return 1
+
+    def register_arguments(self, parser):
+        """Define command arguments."""
+        parser.add_argument(
+            '-d', '--dirname', metavar=_("DIR"), default=None,
+            help=_("save piglit results to DIR"))
+        parser.add_argument(
+            "--test", "-t", metavar=_("PATTERN"), required=True,
+            action='append', help=_("run piglit tests matching given PATTERN"))
+        parser.add_argument(
+            "--verbose", "-v",
+            action='store_true',
+            help=_("be more verbose during testing"))
 
 
 if __name__ == "__main__":
-    sys.exit(main())
+    WrapperCommand().main()
 
=== modified file 'providers/plainbox-provider-piglit/po/pl.po'
--- providers/plainbox-provider-piglit/po/pl.po	2015-04-18 05:08:45 +0000
+++ providers/plainbox-provider-piglit/po/pl.po	2015-04-22 13:03:51 +0000
@@ -7,10 +7,11 @@
 msgstr ""
 "Project-Id-Version: plainbox-provider-piglit 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-08 19:15+0200\n"
+"POT-Creation-Date: 2015-04-22 14:53+0200\n"
 "PO-Revision-Date: 2015-04-09 00:01+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,15 +19,14 @@
 "|| n%100>=20) ? 1 : 2;\n"
 "X-Launchpad-Export-Date: 2015-04-18 05:08+0000\n"
 "X-Generator: Launchpad (build 17430)\n"
-"Language: Polish\n"
 
 #. summary
-#: ../units/piglit.pxu:4
+#: ../units/piglit.pxu:19
 msgid "Run piglit tests for Frame Buffer Object (FBO) operations"
 msgstr "Uruchom testy programu Piglit dla operacji na buforach ramki (FBO)"
 
 #. description
-#: ../units/piglit.pxu:5
+#: ../units/piglit.pxu:20
 msgid ""
 "This job runs piglit tests for checking support for frame buffer object "
 "operations, depth buffer and stencil buffer."
@@ -36,25 +36,24 @@
 "buforach szablonowych."
 
 #. summary
-#: ../units/piglit.pxu:21
+#: ../units/piglit.pxu:36
 msgid "Run piglit tests for OpenGL 2.1"
 msgstr "Uruchom testy programu Piglit dla OpenGL 2.1"
 
 #. description
-#: ../units/piglit.pxu:22
+#: ../units/piglit.pxu:37
 msgid "This job runs piglit tests for checking OpenGL 2.1 support."
 msgstr ""
 "To zadanie uruchamia testy programu Piglit sprawdzające wsparcie dla OpenGL "
 "2.1."
 
 #. summary
-#: ../units/piglit.pxu:37
+#: ../units/piglit.pxu:52
 msgid "Run piglit tests for Vertex Buffer Object (VBO) operations"
-msgstr ""
-"Uruchom testy programu Piglit dla operacji na buforach geometrii (VBO)"
+msgstr "Uruchom testy programu Piglit dla operacji na buforach geometrii (VBO)"
 
 #. description
-#: ../units/piglit.pxu:38
+#: ../units/piglit.pxu:53
 msgid ""
 "This job runs piglit tests for checking support for vertex buffer object "
 "operations."
@@ -63,12 +62,12 @@
 "geometrii."
 
 #. summary
-#: ../units/piglit.pxu:54
+#: ../units/piglit.pxu:69
 msgid "Run piglit tests for GLSL fragment shader operations"
 msgstr "Uruchom testy programu Piglit dla operacji GLSL cieniowania pikseli"
 
 #. description
-#: ../units/piglit.pxu:55
+#: ../units/piglit.pxu:70
 msgid ""
 "This job runs piglit tests for checking support for GLSL fragment shader "
 "operations."
@@ -77,13 +76,13 @@
 "cieniowania pikseli GLSL."
 
 #. summary
-#: ../units/piglit.pxu:71
+#: ../units/piglit.pxu:86
 msgid "Run piglit tests for GLSL vertex shader operations"
 msgstr ""
 "Uruchom testy programu Piglit dla operacji GLSL cieniowania wierzchołków"
 
 #. description
-#: ../units/piglit.pxu:72
+#: ../units/piglit.pxu:87
 msgid ""
 "This job runs piglit tests for checking support for GLSL vertex shader "
 "operations."
@@ -92,12 +91,12 @@
 "cieniowania wierzchołków GLSL."
 
 #. summary
-#: ../units/piglit.pxu:90
+#: ../units/piglit.pxu:105
 msgid "Run piglit tests for texture-from-pixmap extension"
 msgstr "Uruchom testy programu Piglit dla rozszerzenia tekstura-z-piksmapy"
 
 #. description
-#: ../units/piglit.pxu:91
+#: ../units/piglit.pxu:106
 msgid ""
 "This job runs piglit tests for checking support for texture from pixmap."
 msgstr ""
@@ -105,12 +104,12 @@
 "rozszerzenia tekstura-z-piksmapy."
 
 #. summary
-#: ../units/piglit.pxu:106
+#: ../units/piglit.pxu:121
 msgid "Run piglit tests for stencil buffer operations"
 msgstr "Uruchom testy programu Piglit dla operacji na buforach szablonowych"
 
 #. description
-#: ../units/piglit.pxu:107
+#: ../units/piglit.pxu:122
 msgid ""
 "This job runs piglit tests for checking support for stencil buffer "
 "operations."
@@ -119,12 +118,12 @@
 "buforach szablonowych."
 
 #. summary
-#: ../units/piglit.pxu:123
+#: ../units/piglit.pxu:138
 msgid "Combine all piglit test results into one"
 msgstr "Połącz wszystkie wyniki testów programu Piglit w jeden"
 
 #. description
-#: ../units/piglit.pxu:124
+#: ../units/piglit.pxu:139
 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 "
@@ -135,12 +134,12 @@
 "użycia generatora raportów programu Piglit."
 
 #. summary
-#: ../units/piglit.pxu:140
+#: ../units/piglit.pxu:155
 msgid "Create a HTML summary of all the piglit test results"
 msgstr "Utwórz HTML'owe podsumowanie wyników testów programu Piglit"
 
 #. description
-#: ../units/piglit.pxu:141
+#: ../units/piglit.pxu:156
 msgid ""
 "This job runs the piglit HTML report generator on the combination of all the "
 "past results."
@@ -149,12 +148,12 @@
 "wynikach wszystkich testów."
 
 #. summary
-#: ../units/piglit.pxu:159
+#: ../units/piglit.pxu:174
 msgid "Archive HTML summary of all piglit test results"
 msgstr "Zarchiwizuj HTML'owe podsumowanie wyników testów programu Piglit"
 
 #. description
-#: ../units/piglit.pxu:160
+#: ../units/piglit.pxu:175
 msgid ""
 "This job archives the HTML summary of all the piglit results for convenient "
 "access. The result is not added as plainbox system attachment attachment but "
@@ -165,12 +164,12 @@
 "plainbox, może być jednak skopiowany z katalogu sesji."
 
 #. name
-#: ../units/piglit.pxu:177
+#: ../units/piglit.pxu:192
 msgid "Select piglit tests"
 msgstr "Wybrane testy programu Piglit"
 
 #. description
-#: ../units/piglit.pxu:178
+#: ../units/piglit.pxu:193
 msgid ""
 "This test plan runs a selection of piglit tests, summarizes them and creates "
 "an archive for easy inspection and sharing."
@@ -179,7 +178,7 @@
 "oraz archiwum które ułatwia analizę oraz współdzielenie danych."
 
 #. description
-#: ../units/piglit.pxu:190
+#: ../units/piglit.pxu:205
 msgid "Piglit Tests"
 msgstr "Testy programu Piglit"
 
@@ -209,47 +208,43 @@
 msgid "Analyzing piglit test results (format 4)"
 msgstr "Analizowanie wyników testów programu Piglit (format 4)"
 
-#: ../bin/piglit-wrapper:160
-msgid "Tool for running piglit tests"
-msgstr "Narzędzie do uruchamiania testów programu Piglit"
-
-#: ../bin/piglit-wrapper:162 ../bin/piglit-combiner:172
-#: ../bin/piglit-combiner:175
+#: ../bin/piglit-wrapper:185
+msgid "This version of piglit is not supported"
+msgstr "Ta wersja programu Piglit nie jest wspierana"
+
+#: ../bin/piglit-wrapper:188
+msgid "Summary of results (by outcome)"
+msgstr "Podsumowanie wyników (wedle statusu)"
+
+#: ../bin/piglit-wrapper:195
+msgid "Tests successful"
+msgstr "Test zakończony powodzeniem"
+
+#: ../bin/piglit-wrapper:198
+msgid "Tests unsuccessful"
+msgstr "Test zakończony niepowodzeniem"
+
+#: ../bin/piglit-wrapper:204 ../bin/piglit-combiner:206
+#: ../bin/piglit-combiner:209
 msgid "DIR"
 msgstr "KATALOG"
 
-#: ../bin/piglit-wrapper:163
+#: ../bin/piglit-wrapper:205
 msgid "save piglit results to DIR"
 msgstr "zapisz wyniki testów programu Piglit do KATALOGU"
 
-#: ../bin/piglit-wrapper:165
+#: ../bin/piglit-wrapper:207
 msgid "PATTERN"
 msgstr "WZORZEC"
 
-#: ../bin/piglit-wrapper:166
+#: ../bin/piglit-wrapper:208
 msgid "run piglit tests matching given PATTERN"
 msgstr "uruchom testy programu Piglit pasujące do WZORCA"
 
-#: ../bin/piglit-wrapper:170
+#: ../bin/piglit-wrapper:212
 msgid "be more verbose during testing"
 msgstr "bądź bardziej wygadany podczas testowania"
 
-#: ../bin/piglit-wrapper:178
-msgid "This version of piglit is not supported"
-msgstr "Ta wersja programu Piglit nie jest wspierana"
-
-#: ../bin/piglit-wrapper:181
-msgid "Summary of results (by outcome)"
-msgstr "Podsumowanie wyników (wedle statusu)"
-
-#: ../bin/piglit-wrapper:188
-msgid "Tests successful"
-msgstr "Test zakończony powodzeniem"
-
-#: ../bin/piglit-wrapper:191
-msgid "Tests unsuccessful"
-msgstr "Test zakończony niepowodzeniem"
-
 #: ../bin/piglit-combiner:44
 msgid "Discovering all results in directory: %r"
 msgstr "Odnajdywanie wszystkich wyników w katalogu: %r"
@@ -270,29 +265,12 @@
 msgid "Combination function failed for: {!r}"
 msgstr "Funkcja łącząca zawiodła dla: {!r}"
 
-#: ../bin/piglit-combiner:169
-msgid "Tool for combining results of multiple runs of piglit"
-msgstr ""
-"Narzędzie do łączenia wyników wielokrotnych uruchomień programu Piglit"
-
-#: ../bin/piglit-combiner:173
-msgid "directory with results to load (recursively)"
-msgstr "katalog z którego wczytać wyniki (rekurencyjne)"
-
-#: ../bin/piglit-combiner:176
-msgid "directory to save results to"
-msgstr "katalog do zapisania wyników"
-
-#: ../bin/piglit-combiner:180 ../bin/piglit-archiver:54
-msgid "be more verbose"
-msgstr "bądź bardziej wymowny"
-
-#: ../bin/piglit-combiner:188
+#: ../bin/piglit-combiner:194
 #, c-format
 msgid "Unable to combine results: %s"
 msgstr "Nie można połączyć wyników: %s"
 
-#: ../bin/piglit-combiner:192
+#: ../bin/piglit-combiner:198
 #, c-format
 msgid "Combined %d result"
 msgid_plural "Combined %d results"
@@ -300,30 +278,52 @@
 msgstr[1] "Połączono %d wyniki"
 msgstr[2] "Połączono %d wyników"
 
-#: ../bin/piglit-combiner:194
+#: ../bin/piglit-combiner:200
 msgid "No results were really combined!"
 msgstr "Tak na prawdę to nie połączono żadnych wyników!"
 
-#: ../bin/piglit-archiver:38
-msgid "Tool for archiving piglit report"
-msgstr "Narzędzie do archiwizacji raportu programu Piglit"
-
-#: ../bin/piglit-archiver:41
+#: ../bin/piglit-combiner:207
+msgid "directory with results to load (recursively)"
+msgstr "katalog z którego wczytać wyniki (rekurencyjne)"
+
+#: ../bin/piglit-combiner:210
+msgid "directory to save results to"
+msgstr "katalog do zapisania wyników"
+
+#: ../bin/piglit-combiner:214 ../bin/piglit-archiver:90
+msgid "be more verbose"
+msgstr "bądź bardziej wymowny"
+
+#: ../bin/piglit-archiver:70
+msgid "Archive with summary of piglit results is available in"
+msgstr "Archiwum z podsumowaniem wyników programu Piglit jest dostępne w"
+
+#: ../bin/piglit-archiver:77
 msgid "base name of the archive"
 msgstr "nazwa bazowa archiwum"
 
-#: ../bin/piglit-archiver:44
+#: ../bin/piglit-archiver:80
 msgid "format of the archive to create"
 msgstr "format archiwum do utworzenia"
 
-#: ../bin/piglit-archiver:47 ../bin/piglit-archiver:50
+#: ../bin/piglit-archiver:83
 msgid "root directory of the archive"
 msgstr "główny katalog archiwum"
 
-#: ../bin/piglit-archiver:63
-msgid "Archive with summary of piglit results is available in"
-msgstr "Archiwum z podsumowaniem wyników programu Piglit jest dostępne w"
+#: ../bin/piglit-archiver:86
+msgid "base directory of the archive"
+msgstr "bazowy katalog archiwum"
 
 #: ../manage.py:25
 msgid "Piglit (OpenGL/OpenCL) Test Provider"
 msgstr "Dostawca testów Piglit (OpenGL/OpenCL)"
+
+#~ msgid "Tool for running piglit tests"
+#~ msgstr "Narzędzie do uruchamiania testów programu Piglit"
+
+#~ msgid "Tool for combining results of multiple runs of piglit"
+#~ msgstr ""
+#~ "Narzędzie do łączenia wyników wielokrotnych uruchomień programu Piglit"
+
+#~ msgid "Tool for archiving piglit report"
+#~ msgstr "Narzędzie do archiwizacji raportu programu Piglit"
 
=== modified file 'providers/plainbox-provider-piglit/po/plainbox-provider-piglit.pot'
--- providers/plainbox-provider-piglit/po/plainbox-provider-piglit.pot	2015-04-08 17:16:41 +0000
+++ providers/plainbox-provider-piglit/po/plainbox-provider-piglit.pot	2015-04-22 13:03:51 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-08 19:15+0200\n"
+"POT-Creation-Date: 2015-04-22 14:53+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:4
+#: ../units/piglit.pxu:19
 msgid "Run piglit tests for Frame Buffer Object (FBO) operations"
 msgstr ""
 
 #. description
-#: ../units/piglit.pxu:5
+#: ../units/piglit.pxu:20
 msgid ""
 "This job runs piglit tests for checking support for frame buffer object "
 "operations, depth buffer and stencil buffer."
 msgstr ""
 
 #. summary
-#: ../units/piglit.pxu:21
+#: ../units/piglit.pxu:36
 msgid "Run piglit tests for OpenGL 2.1"
 msgstr ""
 
 #. description
-#: ../units/piglit.pxu:22
+#: ../units/piglit.pxu:37
 msgid "This job runs piglit tests for checking OpenGL 2.1 support."
 msgstr ""
 
 #. summary
-#: ../units/piglit.pxu:37
+#: ../units/piglit.pxu:52
 msgid "Run piglit tests for Vertex Buffer Object (VBO) operations"
 msgstr ""
 
 #. description
-#: ../units/piglit.pxu:38
+#: ../units/piglit.pxu:53
 msgid ""
 "This job runs piglit tests for checking support for vertex buffer object "
 "operations."
 msgstr ""
 
 #. summary
-#: ../units/piglit.pxu:54
+#: ../units/piglit.pxu:69
 msgid "Run piglit tests for GLSL fragment shader operations"
 msgstr ""
 
 #. description
-#: ../units/piglit.pxu:55
+#: ../units/piglit.pxu:70
 msgid ""
 "This job runs piglit tests for checking support for GLSL fragment shader "
 "operations."
 msgstr ""
 
 #. summary
-#: ../units/piglit.pxu:71
+#: ../units/piglit.pxu:86
 msgid "Run piglit tests for GLSL vertex shader operations"
 msgstr ""
 
 #. description
-#: ../units/piglit.pxu:72
+#: ../units/piglit.pxu:87
 msgid ""
 "This job runs piglit tests for checking support for GLSL vertex shader "
 "operations."
 msgstr ""
 
 #. summary
-#: ../units/piglit.pxu:90
+#: ../units/piglit.pxu:105
 msgid "Run piglit tests for texture-from-pixmap extension"
 msgstr ""
 
 #. description
-#: ../units/piglit.pxu:91
+#: ../units/piglit.pxu:106
 msgid ""
 "This job runs piglit tests for checking support for texture from pixmap."
 msgstr ""
 
 #. summary
-#: ../units/piglit.pxu:106
+#: ../units/piglit.pxu:121
 msgid "Run piglit tests for stencil buffer operations"
 msgstr ""
 
 #. description
-#: ../units/piglit.pxu:107
+#: ../units/piglit.pxu:122
 msgid ""
 "This job runs piglit tests for checking support for stencil buffer "
 "operations."
 msgstr ""
 
 #. summary
-#: ../units/piglit.pxu:123
+#: ../units/piglit.pxu:138
 msgid "Combine all piglit test results into one"
 msgstr ""
 
 #. description
-#: ../units/piglit.pxu:124
+#: ../units/piglit.pxu:139
 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:140
+#: ../units/piglit.pxu:155
 msgid "Create a HTML summary of all the piglit test results"
 msgstr ""
 
 #. description
-#: ../units/piglit.pxu:141
+#: ../units/piglit.pxu:156
 msgid ""
 "This job runs the piglit HTML report generator on the combination of all the "
 "past results."
 msgstr ""
 
 #. summary
-#: ../units/piglit.pxu:159
+#: ../units/piglit.pxu:174
 msgid "Archive HTML summary of all piglit test results"
 msgstr ""
 
 #. description
-#: ../units/piglit.pxu:160
+#: ../units/piglit.pxu:175
 msgid ""
 "This job archives the HTML summary of all the piglit results for convenient "
 "access. The result is not added as plainbox system attachment attachment but "
@@ -138,19 +138,19 @@
 msgstr ""
 
 #. name
-#: ../units/piglit.pxu:177
+#: ../units/piglit.pxu:192
 msgid "Select piglit tests"
 msgstr ""
 
 #. description
-#: ../units/piglit.pxu:178
+#: ../units/piglit.pxu:193
 msgid ""
 "This test plan runs a selection of piglit tests, summarizes them and creates "
 "an archive for easy inspection and sharing."
 msgstr ""
 
 #. description
-#: ../units/piglit.pxu:190
+#: ../units/piglit.pxu:205
 msgid "Piglit Tests"
 msgstr ""
 
@@ -180,47 +180,43 @@
 msgid "Analyzing piglit test results (format 4)"
 msgstr ""
 
-#: ../bin/piglit-wrapper:160
-msgid "Tool for running piglit tests"
-msgstr ""
-
-#: ../bin/piglit-wrapper:162 ../bin/piglit-combiner:172
-#: ../bin/piglit-combiner:175
+#: ../bin/piglit-wrapper:185
+msgid "This version of piglit is not supported"
+msgstr ""
+
+#: ../bin/piglit-wrapper:188
+msgid "Summary of results (by outcome)"
+msgstr ""
+
+#: ../bin/piglit-wrapper:195
+msgid "Tests successful"
+msgstr ""
+
+#: ../bin/piglit-wrapper:198
+msgid "Tests unsuccessful"
+msgstr ""
+
+#: ../bin/piglit-wrapper:204 ../bin/piglit-combiner:206
+#: ../bin/piglit-combiner:209
 msgid "DIR"
 msgstr ""
 
-#: ../bin/piglit-wrapper:163
+#: ../bin/piglit-wrapper:205
 msgid "save piglit results to DIR"
 msgstr ""
 
-#: ../bin/piglit-wrapper:165
+#: ../bin/piglit-wrapper:207
 msgid "PATTERN"
 msgstr ""
 
-#: ../bin/piglit-wrapper:166
+#: ../bin/piglit-wrapper:208
 msgid "run piglit tests matching given PATTERN"
 msgstr ""
 
-#: ../bin/piglit-wrapper:170
+#: ../bin/piglit-wrapper:212
 msgid "be more verbose during testing"
 msgstr ""
 
-#: ../bin/piglit-wrapper:178
-msgid "This version of piglit is not supported"
-msgstr ""
-
-#: ../bin/piglit-wrapper:181
-msgid "Summary of results (by outcome)"
-msgstr ""
-
-#: ../bin/piglit-wrapper:188
-msgid "Tests successful"
-msgstr ""
-
-#: ../bin/piglit-wrapper:191
-msgid "Tests unsuccessful"
-msgstr ""
-
 #: ../bin/piglit-combiner:44
 msgid "Discovering all results in directory: %r"
 msgstr ""
@@ -241,56 +237,52 @@
 msgid "Combination function failed for: {!r}"
 msgstr ""
 
-#: ../bin/piglit-combiner:169
-msgid "Tool for combining results of multiple runs of piglit"
-msgstr ""
-
-#: ../bin/piglit-combiner:173
-msgid "directory with results to load (recursively)"
-msgstr ""
-
-#: ../bin/piglit-combiner:176
-msgid "directory to save results to"
-msgstr ""
-
-#: ../bin/piglit-combiner:180 ../bin/piglit-archiver:54
-msgid "be more verbose"
-msgstr ""
-
-#: ../bin/piglit-combiner:188
+#: ../bin/piglit-combiner:194
 #, c-format
 msgid "Unable to combine results: %s"
 msgstr ""
 
-#: ../bin/piglit-combiner:192
+#: ../bin/piglit-combiner:198
 #, c-format
 msgid "Combined %d result"
 msgid_plural "Combined %d results"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../bin/piglit-combiner:194
+#: ../bin/piglit-combiner:200
 msgid "No results were really combined!"
 msgstr ""
 
-#: ../bin/piglit-archiver:38
-msgid "Tool for archiving piglit report"
-msgstr ""
-
-#: ../bin/piglit-archiver:41
+#: ../bin/piglit-combiner:207
+msgid "directory with results to load (recursively)"
+msgstr ""
+
+#: ../bin/piglit-combiner:210
+msgid "directory to save results to"
+msgstr ""
+
+#: ../bin/piglit-combiner:214 ../bin/piglit-archiver:90
+msgid "be more verbose"
+msgstr ""
+
+#: ../bin/piglit-archiver:70
+msgid "Archive with summary of piglit results is available in"
+msgstr ""
+
+#: ../bin/piglit-archiver:77
 msgid "base name of the archive"
 msgstr ""
 
-#: ../bin/piglit-archiver:44
+#: ../bin/piglit-archiver:80
 msgid "format of the archive to create"
 msgstr ""
 
-#: ../bin/piglit-archiver:47 ../bin/piglit-archiver:50
+#: ../bin/piglit-archiver:83
 msgid "root directory of the archive"
 msgstr ""
 
-#: ../bin/piglit-archiver:63
-msgid "Archive with summary of piglit results is available in"
+#: ../bin/piglit-archiver:86
+msgid "base directory of the archive"
 msgstr ""
 
 #: ../manage.py:25
 
=== modified file 'providers/plainbox-provider-piglit/units/piglit.pxu'
--- providers/plainbox-provider-piglit/units/piglit.pxu	2015-04-08 17:13:51 +0000
+++ providers/plainbox-provider-piglit/units/piglit.pxu	2015-04-22 13:03:51 +0000
@@ -1,3 +1,18 @@
+# This is for all the Python scripts
+unit: packaging meta-data
+os-id: debian
+Depends: python3 (>= 3.2)
+
+# This is for piglit, obviously
+unit: packaging meta-data
+os-id: debian
+Depends: piglit
+
+# This is for the scripts as well
+unit: packaging meta-data
+os-id: debian
+Depends: python3-guacamole
+
 unit: job
 id: piglit/test/fbo
 category_id: 2013.com.canonical.plainbox::graphics