Import plainbox-provider-checkbox_0.4.orig.tar.gzupstream-0.4patched-0.4-1

185 files changed, 3097 insertions, 2480 deletions

diff --git a/COPYING b/COPYING
deleted file mode 100644
index 94a9ed0..0000000
--- a/COPYING
+++ /dev/null
@@ -1,674 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users. We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors. You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
- To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights. Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received. You must make sure that they, too, receive
-or can get the source code. And you must show them these terms so they
-know their rights.
-
- Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
- For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software. For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
- Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so. This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software. The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable. Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products. If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
- Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary. To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- TERMS AND CONDITIONS
-
- 0. Definitions.
-
- "This License" refers to version 3 of the GNU General Public License.
-
- "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
- "The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
- To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy. The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
- A "covered work" means either the unmodified Program or a work based
-on the Program.
-
- To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
- To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
- An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
- 1. Source Code.
-
- The "source code" for a work means the preferred form of the work
-for making modifications to it. "Object code" means any non-source
-form of a work.
-
- A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
- The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
- The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
- The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
- The Corresponding Source for a work in source code form is that
-same work.
-
- 2. Basic Permissions.
-
- All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
- You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright. Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
- Conveying under any other circumstances is permitted solely under
-the conditions stated below. Sublicensing is not allowed; section 10
-makes it unnecessary.
-
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
- No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
- When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
- 4. Conveying Verbatim Copies.
-
- You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
- You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
- 5. Conveying Modified Source Versions.
-
- You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
- a) The work must carry prominent notices stating that you modified
- it, and giving a relevant date.
-
- b) The work must carry prominent notices stating that it is
- released under this License and any conditions added under section
- 7. This requirement modifies the requirement in section 4 to
- "keep intact all notices".
-
- c) You must license the entire work, as a whole, under this
- License to anyone who comes into possession of a copy. This
- License will therefore apply, along with any applicable section 7
- additional terms, to the whole of the work, and all its parts,
- regardless of how they are packaged. This License gives no
- permission to license the work in any other way, but it does not
- invalidate such permission if you have separately received it.
-
- d) If the work has interactive user interfaces, each must display
- Appropriate Legal Notices; however, if the Program has interactive
- interfaces that do not display Appropriate Legal Notices, your
- work need not make them do so.
-
- A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
- 6. Conveying Non-Source Forms.
-
- You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
- a) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by the
- Corresponding Source fixed on a durable physical medium
- customarily used for software interchange.
-
- b) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by a
- written offer, valid for at least three years and valid for as
- long as you offer spare parts or customer support for that product
- model, to give anyone who possesses the object code either (1) a
- copy of the Corresponding Source for all the software in the
- product that is covered by this License, on a durable physical
- medium customarily used for software interchange, for a price no
- more than your reasonable cost of physically performing this
- conveying of source, or (2) access to copy the
- Corresponding Source from a network server at no charge.
-
- c) Convey individual copies of the object code with a copy of the
- written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and noncommercially, and
- only if you received the object code with such an offer, in accord
- with subsection 6b.
-
- d) Convey the object code by offering access from a designated
- place (gratis or for a charge), and offer equivalent access to the
- Corresponding Source in the same way through the same place at no
- further charge. You need not require recipients to copy the
- Corresponding Source along with the object code. If the place to
- copy the object code is a network server, the Corresponding Source
- may be on a different server (operated by you or a third party)
- that supports equivalent copying facilities, provided you maintain
- clear directions next to the object code saying where to find the
- Corresponding Source. Regardless of what server hosts the
- Corresponding Source, you remain obligated to ensure that it is
- available for as long as needed to satisfy these requirements.
-
- e) Convey the object code using peer-to-peer transmission, provided
- you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
- charge under subsection 6d.
-
- A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
- A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage. For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product. A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
- "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source. The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
- If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
- The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed. Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
- Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
- 7. Additional Terms.
-
- "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
- When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
- Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
- a) Disclaiming warranty or limiting liability differently from the
- terms of sections 15 and 16 of this License; or
-
- b) Requiring preservation of specified reasonable legal notices or
- author attributions in that material or in the Appropriate Legal
- Notices displayed by works containing it; or
-
- c) Prohibiting misrepresentation of the origin of that material, or
- requiring that modified versions of such material be marked in
- reasonable ways as different from the original version; or
-
- d) Limiting the use for publicity purposes of names of licensors or
- authors of the material; or
-
- e) Declining to grant rights under trademark law for use of some
- trade names, trademarks, or service marks; or
-
- f) Requiring indemnification of licensors and authors of that
- material by anyone who conveys the material (or modified versions of
- it) with contractual assumptions of liability to the recipient, for
- any liability that these contractual assumptions directly impose on
- those licensors and authors.
-
- All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
- If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
- Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
- 8. Termination.
-
- You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
- However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
- Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
- Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
- 9. Acceptance Not Required for Having Copies.
-
- You are not required to accept this License in order to receive or
-run a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
- 10. Automatic Licensing of Downstream Recipients.
-
- Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
- An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
- You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
- 11. Patents.
-
- A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
- A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
- Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
- In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
- If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
- If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
- A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License. You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
- Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
- 12. No Surrender of Others' Freedom.
-
- If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
- 13. Use with the GNU Affero General Public License.
-
- Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
- 14. Revised Versions of this License.
-
- The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
- If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
- Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
- 15. Disclaimer of Warranty.
-
- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. Limitation of Liability.
-
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
- 17. Interpretation of Sections 15 and 16.
-
- If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
- If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
- <program> Copyright (C) <year> <name of author>
- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
- You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
- The GNU General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License. But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/MANIFEST b/MANIFEST
deleted file mode 100644
index c746b8f..0000000
--- a/MANIFEST
+++ /dev/null
@@ -1,172 +0,0 @@
-# file GENERATED by distutils, do NOT edit
-COPYING
-MANIFEST
-README.rst
-checkbox.provider
-setup.cfg
-setup.py
-po/placeholder.txt
-provider_bin/accelerometer_test
-provider_bin/alsa_info
-provider_bin/alsa_record_playback
-provider_bin/ansi_parser
-provider_bin/audio_driver_info
-provider_bin/audio_settings
-provider_bin/audio_test
-provider_bin/battery_test
-provider_bin/bluetooth_scan
-provider_bin/bluetooth_test
-provider_bin/brightness_test
-provider_bin/camera_test
-provider_bin/check_is_laptop
-provider_bin/cking_suite
-provider_bin/clocktest.c
-provider_bin/color_depth_info
-provider_bin/connect_wireless
-provider_bin/cpu_offlining
-provider_bin/cpu_topology
-provider_bin/create_connection
-provider_bin/cycle_vts
-provider_bin/disk_read_performance_test
-provider_bin/disk_smart
-provider_bin/disk_stats_test
-provider_bin/dns_server_test
-provider_bin/filter_templates
-provider_bin/floppy_test
-provider_bin/frequency_governors_test
-provider_bin/fresh_rate_info
-provider_bin/fwts_test
-provider_bin/gateway_ping_test
-provider_bin/gcov_tarball
-provider_bin/glob_test
-provider_bin/gpu_test
-provider_bin/gputest_benchmark
-provider_bin/graphic_memory_info
-provider_bin/graphics_driver
-provider_bin/graphics_modes_info
-provider_bin/graphics_stress_test
-provider_bin/gst_pipeline_test
-provider_bin/ipmi_test
-provider_bin/key_test
-provider_bin/keyboard_test
-provider_bin/lamp_test
-provider_bin/led_hdd_test
-provider_bin/lock_screen_watcher
-provider_bin/lsmod_info
-provider_bin/max_diskspace_used
-provider_bin/memory_compare
-provider_bin/memory_info
-provider_bin/memory_test
-provider_bin/mm-test
-provider_bin/network
-provider_bin/network_bandwidth_test
-provider_bin/network_check
-provider_bin/network_device_info
-provider_bin/network_info
-provider_bin/network_ntp_test
-provider_bin/network_printer_test
-provider_bin/network_reconnect_resume_test
-provider_bin/network_restart
-provider_bin/network_wait
-provider_bin/obex_send
-provider_bin/optical_detect
-provider_bin/optical_read_test
-provider_bin/optical_write_test
-provider_bin/piglit_test
-provider_bin/pm_log_check
-provider_bin/pm_test
-provider_bin/process_wait
-provider_bin/pts_run
-provider_bin/removable_storage_test
-provider_bin/removable_storage_watcher
-provider_bin/rendercheck_test
-provider_bin/resolution_test
-provider_bin/resolution_test.qml
-provider_bin/rotation_test
-provider_bin/run_templates
-provider_bin/samba_test
-provider_bin/sleep_test
-provider_bin/sleep_test_log_check
-provider_bin/sleep_time_check
-provider_bin/sources_test
-provider_bin/spindown
-provider_bin/storage_test
-provider_bin/threaded_memtest.c
-provider_bin/tomcat_test
-provider_bin/touchpad_driver_info
-provider_bin/touchpad_test
-provider_bin/udisks2_monitor
-provider_bin/virtualization
-provider_bin/volume_test
-provider_bin/wifi_time2reconnect
-provider_bin/window_test
-provider_bin/wireless_ext
-provider_bin/xen_test
-provider_bin/xml_sanitize
-provider_bin/xrandr_cycle
-provider_data/images/JPEG_Color_Image_Ubuntu.jpg
-provider_data/images/PNG_Color_Image_Ubuntu.png
-provider_data/settings/shutter.xml
-provider_data/video/Ogg_Theora_Video.ogv
-provider_data/video/Quicktime_Video.mov
-provider_data/websites/Flash_Video.flv
-provider_data/websites/PNG_Color_Image_Ubuntu.png
-provider_data/websites/SWF_Test.as
-provider_data/websites/SWF_Test.swf
-provider_data/websites/flashtest.html
-provider_data/websites/flashvideo.html
-provider_data/websites/html5_video.html
-provider_data/websites/testindex.html
-provider_jobs/audio.txt.in
-provider_jobs/benchmarks.txt.in
-provider_jobs/bluetooth.txt.in
-provider_jobs/camera.txt.in
-provider_jobs/codecs.txt.in
-provider_jobs/cpu.txt.in
-provider_jobs/daemons.txt.in
-provider_jobs/disk.txt.in
-provider_jobs/esata.txt.in
-provider_jobs/ethernet.txt.in
-provider_jobs/expresscard.txt.in
-provider_jobs/fingerprint.txt.in
-provider_jobs/firewire.txt.in
-provider_jobs/firmware.txt.in
-provider_jobs/floppy.txt.in
-provider_jobs/graphics.txt.in
-provider_jobs/hibernate.txt.in
-provider_jobs/info.txt.in
-provider_jobs/input.txt.in
-provider_jobs/install.txt.in
-provider_jobs/keys.txt.in
-provider_jobs/led.txt.in
-provider_jobs/local.txt.in
-provider_jobs/mediacard.txt.in
-provider_jobs/memory.txt.in
-provider_jobs/miscellanea.txt.in
-provider_jobs/mobilebroadband.txt.in
-provider_jobs/monitor.txt.in
-provider_jobs/networking.txt.in
-provider_jobs/optical.txt.in
-provider_jobs/panel_clock_test.txt.in
-provider_jobs/panel_reboot.txt.in
-provider_jobs/peripheral.txt.in
-provider_jobs/piglit.txt.in
-provider_jobs/power-management.txt.in
-provider_jobs/rendercheck.txt.in
-provider_jobs/server-services.txt.in
-provider_jobs/smoke.txt.in
-provider_jobs/sniff.txt.in
-provider_jobs/stress.txt.in
-provider_jobs/suspend.txt.in
-provider_jobs/touchpad.txt.in
-provider_jobs/touchscreen.txt.in
-provider_jobs/usb.txt.in
-provider_jobs/user_apps.txt.in
-provider_jobs/virtualization.txt.in
-provider_jobs/wireless.txt.in
-provider_whitelists/autotesting.whitelist
-provider_whitelists/default.whitelist
-provider_whitelists/hwsubmit.whitelist
-provider_whitelists/smoke.whitelist
-provider_whitelists/sniff.whitelist
-provider_whitelists/sru.whitelist
diff --git a/PKG-INFO b/PKG-INFO
deleted file mode 100644
index f6ffc0a..0000000
--- a/PKG-INFO
+++ /dev/null
@@ -1,12 +0,0 @@
-Metadata-Version: 1.0
-Name: plainbox-provider-checkbox
-Version: 0.3
-Summary: CheckBox provider
-Home-page: https://launchpad.net/checkbox/
-Author: Sylvain Pineau
-Author-email: sylvain.pineau@canonical.com
-License: GPLv3
-Description: CheckBox provider is a collection of tests for system testing.
- It is used together alongside with PlainBox
- 
-Platform: UNKNOWN
diff --git a/README.rst b/README.rst
deleted file mode 100644
index 8e12825..0000000
--- a/README.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-CheckBox provider is a collection of tests for system testing.
-It is used together alongside with PlainBox
diff --git a/provider_bin/accelerometer_test b/bin/accelerometer_test
index 93130fc..93130fc 100755
--- a/provider_bin/accelerometer_test
+++ b/bin/accelerometer_test
diff --git a/provider_bin/alsa_info b/bin/alsa_info
index 721ab41..721ab41 100755
--- a/provider_bin/alsa_info
+++ b/bin/alsa_info
diff --git a/provider_bin/alsa_record_playback b/bin/alsa_record_playback
index cf5142b..cf5142b 100755
--- a/provider_bin/alsa_record_playback
+++ b/bin/alsa_record_playback
diff --git a/provider_bin/ansi_parser b/bin/ansi_parser
index 9082609..9082609 100755
--- a/provider_bin/ansi_parser
+++ b/bin/ansi_parser
diff --git a/provider_bin/audio_driver_info b/bin/audio_driver_info
index a058064..a058064 100755
--- a/provider_bin/audio_driver_info
+++ b/bin/audio_driver_info
diff --git a/provider_bin/audio_settings b/bin/audio_settings
index 847d620..847d620 100755
--- a/provider_bin/audio_settings
+++ b/bin/audio_settings
diff --git a/provider_bin/audio_test b/bin/audio_test
index f0b73a4..f0b73a4 100755
--- a/provider_bin/audio_test
+++ b/bin/audio_test
diff --git a/provider_bin/battery_test b/bin/battery_test
index cdfd227..cdfd227 100755
--- a/provider_bin/battery_test
+++ b/bin/battery_test
diff --git a/provider_bin/bluetooth_scan b/bin/bluetooth_scan
index 495ebdd..495ebdd 100755
--- a/provider_bin/bluetooth_scan
+++ b/bin/bluetooth_scan
diff --git a/provider_bin/bluetooth_test b/bin/bluetooth_test
index 8fafad6..8fafad6 100755
--- a/provider_bin/bluetooth_test
+++ b/bin/bluetooth_test
diff --git a/provider_bin/brightness_test b/bin/brightness_test
index 2f70238..2f70238 100755
--- a/provider_bin/brightness_test
+++ b/bin/brightness_test
diff --git a/provider_bin/camera_test b/bin/camera_test
index f863ec5..019736c 100755
--- a/provider_bin/camera_test
+++ b/bin/camera_test
@@ -264,7 +264,7 @@ class CameraTest:
 image size and quiet controls whether the image is displayed to the
 user (quiet = True means do not display image).
 """
- command = ["fswebcam", "-S 3", "--no-banner",
+ command = ["fswebcam", "-D 1", "-S 50", "--no-banner",
 "-d", self.args.device,
 "-r", "%dx%d"
 % (width, height), filename]
diff --git a/provider_bin/check_is_laptop b/bin/check_is_laptop
index 5820a37..5820a37 100755
--- a/provider_bin/check_is_laptop
+++ b/bin/check_is_laptop
diff --git a/provider_bin/cking_suite b/bin/cking_suite
index 8c6f462..8c6f462 100755
--- a/provider_bin/cking_suite
+++ b/bin/cking_suite
diff --git a/provider_bin/color_depth_info b/bin/color_depth_info
index a8a42df..a8a42df 100755
--- a/provider_bin/color_depth_info
+++ b/bin/color_depth_info
diff --git a/provider_bin/connect_wireless b/bin/connect_wireless
index 54f61f7..54f61f7 100755
--- a/provider_bin/connect_wireless
+++ b/bin/connect_wireless
diff --git a/provider_bin/cpu_offlining b/bin/cpu_offlining
index c1c02a8..c1c02a8 100755
--- a/provider_bin/cpu_offlining
+++ b/bin/cpu_offlining
diff --git a/provider_bin/cpu_topology b/bin/cpu_topology
index e113ae6..e113ae6 100755
--- a/provider_bin/cpu_topology
+++ b/bin/cpu_topology
diff --git a/provider_bin/create_connection b/bin/create_connection
index 6f92859..6f92859 100755
--- a/provider_bin/create_connection
+++ b/bin/create_connection
diff --git a/provider_bin/cycle_vts b/bin/cycle_vts
index 8b7f5bc..8b7f5bc 100755
--- a/provider_bin/cycle_vts
+++ b/bin/cycle_vts
diff --git a/provider_bin/disk_read_performance_test b/bin/disk_read_performance_test
index e2a219d..e2a219d 100755
--- a/provider_bin/disk_read_performance_test
+++ b/bin/disk_read_performance_test
diff --git a/provider_bin/disk_smart b/bin/disk_smart
index 3545700..3545700 100755
--- a/provider_bin/disk_smart
+++ b/bin/disk_smart
diff --git a/provider_bin/disk_stats_test b/bin/disk_stats_test
index 851dff7..851dff7 100755
--- a/provider_bin/disk_stats_test
+++ b/bin/disk_stats_test
diff --git a/provider_bin/dns_server_test b/bin/dns_server_test
index 1b29595..1b29595 100755
--- a/provider_bin/dns_server_test
+++ b/bin/dns_server_test
diff --git a/provider_bin/filter_templates b/bin/filter_templates
index 1c3272d..1c3272d 100755
--- a/provider_bin/filter_templates
+++ b/bin/filter_templates
diff --git a/provider_bin/floppy_test b/bin/floppy_test
index 4675948..4675948 100755
--- a/provider_bin/floppy_test
+++ b/bin/floppy_test
diff --git a/provider_bin/frequency_governors_test b/bin/frequency_governors_test
index 2b8661e..2b8661e 100755
--- a/provider_bin/frequency_governors_test
+++ b/bin/frequency_governors_test
diff --git a/provider_bin/fresh_rate_info b/bin/fresh_rate_info
index 7102067..7102067 100755
--- a/provider_bin/fresh_rate_info
+++ b/bin/fresh_rate_info
diff --git a/provider_bin/fwts_test b/bin/fwts_test
index 7a8ca32..f48cae3 100755
--- a/provider_bin/fwts_test
+++ b/bin/fwts_test
@@ -22,7 +22,6 @@ TESTS = ['acpidump',
 'fadt',
 'hpet_check',
 'klog',
- 'maxfreq',
 'mcfg',
 'method',
 'mpcheck',
@@ -212,7 +211,7 @@ def main():
 elif args.test:
 tests.extend(args.test)
 elif args.all:
- tests.extend(['wakealarm', 'cpufreq'] + TESTS)
+ tests.extend(['wakealarm', 'cpufreq', 'maxfreq'] + TESTS)
 elif args.sleep:
 args.sleep = fix_sleep_args(args.sleep)
 iterations = 1
diff --git a/provider_bin/gateway_ping_test b/bin/gateway_ping_test
index 19d9f2b..19d9f2b 100755
--- a/provider_bin/gateway_ping_test
+++ b/bin/gateway_ping_test
diff --git a/provider_bin/gcov_tarball b/bin/gcov_tarball
index 2b05cf6..2b05cf6 100755
--- a/provider_bin/gcov_tarball
+++ b/bin/gcov_tarball
diff --git a/provider_bin/glob_test b/bin/glob_test
index df13e0f..df13e0f 100755
--- a/provider_bin/glob_test
+++ b/bin/glob_test
diff --git a/provider_bin/gpu_test b/bin/gpu_test
index 8e11e05..eaf4dda 100755
--- a/provider_bin/gpu_test
+++ b/bin/gpu_test
@@ -117,10 +117,10 @@ class Html5VideoThread(Thread):
 
 @property
 def html5_path(self):
- if os.getenv('CHECKBOX_SHARE'):
+ if os.getenv('PLAINBOX_PROVIDER_DATA'):
 return os.path.join(
- os.getenv('CHECKBOX_SHARE'),
- 'data/websites/html5_video.html')
+ os.getenv('PLAINBOX_PROVIDER_DATA'),
+ 'websites/html5_video.html')
 
 def run(self):
 if self.html5_path and os.path.isfile(self.html5_path):
diff --git a/provider_bin/gputest_benchmark b/bin/gputest_benchmark
index 99af634..99af634 100755
--- a/provider_bin/gputest_benchmark
+++ b/bin/gputest_benchmark
diff --git a/provider_bin/graphic_memory_info b/bin/graphic_memory_info
index 46f3dee..46f3dee 100755
--- a/provider_bin/graphic_memory_info
+++ b/bin/graphic_memory_info
diff --git a/provider_bin/graphics_driver b/bin/graphics_driver
index 583aafd..102cb61 100755
--- a/provider_bin/graphics_driver
+++ b/bin/graphics_driver
@@ -169,6 +169,8 @@ class XorgLog(object):
 continue
 
 # EDID and Modelines
+ # We use this part to determine which driver is in use
+ # For Intel / RADEON
 m = re.search(r'\(II\) (.*)\(\d+\): EDID for output (.*)', line)
 if m:
 self.displays[display_name] = display
@@ -186,6 +188,7 @@ class XorgLog(object):
 display = {'Output': display_name}
 continue
 
+ # For NVIDIA
 m = re.search(r'\(II\) (.*)\(\d+\): Setting mode "(.*?):', line)
 if m:
 self.displays[display_name] = display
@@ -194,6 +197,17 @@ class XorgLog(object):
 display = {'Output': display_name}
 continue
 
+ # For 4th Intel on 3.11
+ m = re.search(
+ r'\(II\) (.*)\(\d+\): switch to mode .* using (.*),', line)
+ if m:
+ self.displays[display_name] = display
+ self.video_driver = m.group(1)
+ display_name = m.group(2)
+ display = {'Output': display_name}
+ continue
+
+
 m = re.search(
 r'Manufacturer: (.*) *Model: (.*) *Serial#: (.*)', line)
 if m:
diff --git a/provider_bin/graphics_modes_info b/bin/graphics_modes_info
index 90b887f..90b887f 100755
--- a/provider_bin/graphics_modes_info
+++ b/bin/graphics_modes_info
diff --git a/provider_bin/graphics_stress_test b/bin/graphics_stress_test
index f930bf5..f930bf5 100755
--- a/provider_bin/graphics_stress_test
+++ b/bin/graphics_stress_test
diff --git a/provider_bin/gst_pipeline_test b/bin/gst_pipeline_test
index cde7fbb..cde7fbb 100755
--- a/provider_bin/gst_pipeline_test
+++ b/bin/gst_pipeline_test
diff --git a/provider_bin/ipmi_test b/bin/ipmi_test
index 403f572..403f572 100755
--- a/provider_bin/ipmi_test
+++ b/bin/ipmi_test
diff --git a/provider_bin/key_test b/bin/key_test
index 8726b5f..8726b5f 100755
--- a/provider_bin/key_test
+++ b/bin/key_test
diff --git a/provider_bin/keyboard_test b/bin/keyboard_test
index 309b845..309b845 100755
--- a/provider_bin/keyboard_test
+++ b/bin/keyboard_test
diff --git a/provider_bin/lamp_test b/bin/lamp_test
index f8a641b..f8a641b 100755
--- a/provider_bin/lamp_test
+++ b/bin/lamp_test
diff --git a/provider_bin/led_hdd_test b/bin/led_hdd_test
index eac6ae2..eac6ae2 100755
--- a/provider_bin/led_hdd_test
+++ b/bin/led_hdd_test
diff --git a/provider_bin/lock_screen_watcher b/bin/lock_screen_watcher
index 1ba9779..1ba9779 100755
--- a/provider_bin/lock_screen_watcher
+++ b/bin/lock_screen_watcher
diff --git a/provider_bin/lsmod_info b/bin/lsmod_info
index 3b81542..3b81542 100755
--- a/provider_bin/lsmod_info
+++ b/bin/lsmod_info
diff --git a/provider_bin/max_diskspace_used b/bin/max_diskspace_used
index cc30d85..cc30d85 100755
--- a/provider_bin/max_diskspace_used
+++ b/bin/max_diskspace_used
diff --git a/provider_bin/memory_compare b/bin/memory_compare
index 24d6c84..24d6c84 100755
--- a/provider_bin/memory_compare
+++ b/bin/memory_compare
diff --git a/provider_bin/memory_info b/bin/memory_info
index 708c22d..708c22d 100755
--- a/provider_bin/memory_info
+++ b/bin/memory_info
diff --git a/provider_bin/memory_test b/bin/memory_test
index c42b05f..c42b05f 100755
--- a/provider_bin/memory_test
+++ b/bin/memory_test
diff --git a/provider_bin/mm-test b/bin/mm-test
index 9cd9b25..2c177aa 100755
--- a/provider_bin/mm-test
+++ b/bin/mm-test
@@ -422,10 +422,17 @@ while x < len(sys.argv):
 bus = dbus.SystemBus()
 
 # Get available modems:
-manager_proxy = bus.get_object('org.freedesktop.ModemManager', '/org/freedesktop/ModemManager')
-manager_iface = dbus.Interface(manager_proxy, dbus_interface='org.freedesktop.ModemManager')
-modems = manager_iface.EnumerateDevices()
-
+try:
+ manager_proxy = bus.get_object('org.freedesktop.ModemManager', '/org/freedesktop/ModemManager')
+ manager_iface = dbus.Interface(manager_proxy, dbus_interface='org.freedesktop.ModemManager')
+ modems = manager_iface.EnumerateDevices()
+except dbus.exceptions.DBusException as excp:
+ if (excp.get_dbus_name() == "org.freedesktop.DBus.Error.ServiceUnknown"):
+ print("ERROR: mm-test doesn't work on ModemManager 1.0 and newer: {}".format(
+ excp.get_dbus_message()))
+ else:
+ print("ERROR: {}".format(excp.get_dbus_message()))
+ sys.exit(1)
 if not modems:
 print("No modems found")
 sys.exit(1)
diff --git a/provider_bin/network b/bin/network
index 17757bd..6ab5b16 100755
--- a/provider_bin/network
+++ b/bin/network
@@ -1,9 +1,10 @@
 #!/usr/bin/env python3
 """
-Copyright (C) 2012 Canonical Ltd.
+Copyright (C) 2012-2014 Canonical Ltd.
 
 Authors
 Jeff Marcom <jeff.marcom@canonical.com>
+ Daniel Manrique <roadmr@ubuntu.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License version 3,
@@ -53,12 +54,14 @@ class IPerfPerformanceTest(object):
 self,
 interface,
 target,
+ fail_threshold,
 protocol="tcp",
 mbytes="1024M"):
 
 self.iface = Interface(interface)
 self.target = target
 self.protocol = protocol
+ self.fail_threshold = fail_threshold
 
 self.mbytes = mbytes
 
@@ -86,33 +89,40 @@ class IPerfPerformanceTest(object):
 
 # 930 Mbits/sec\n'
 print(iperf_return)
- match = re.search(r'\d+\s([GM])bits', iperf_return)
+ match = re.search(r'[\d\.]+\s([GM])bits', iperf_return)
 if match:
 throughput = match.group(0).split()[0]
 units = match.group(1)
 # self.iface.max_speed is always in mb/s, so we need to scale
 # throughput to match
- scaled_throughput = int(throughput)
+ scaled_throughput = float(throughput)
 if units == 'G':
 scaled_throughput *= 1000
 if units == 'K':
 scaled_throughput /= 1000
 try:
 percent = scaled_throughput / int(self.iface.max_speed) * 100
- except ZeroDivisionError:
+ except (ZeroDivisionError, TypeError) as error:
 # Catches a condition where the interface functions fine but
 # ethtool fails to properly report max speed. In this case
 # it's up to the reviewer to pass or fail.
 logging.error("Max Speed was not reported properly. Run "
 "ethtool and verify that the card is properly "
 "reporting its capabilities.")
+ logging.error(error)
 percent = 0
 
 print("\nTransfer speed: {} {}b/s".format(throughput, units))
 print("%3.2f%% of " % percent, end="")
- print("theoretical max %sMb/s\n" % int(self.iface.max_speed))
+ try:
+ print("theoretical max %sMb/s\n" % int(self.iface.max_speed))
+ except TypeError as error:
+ logging.error("Max Speed was not reported properly. Run "
+ "ethtool and verify that the card is properly "
+ "reporting its capabilities.")
+ logging.error(error)
 
- if percent < 40:
+ if percent < self.fail_threshold:
 logging.warn("Poor network performance detected")
 return 30
 
@@ -267,6 +277,7 @@ class FTPPerformanceTest(object):
 print("Failed sending file via ftp")
 return 1
 
+
 class StressPerformanceTest:
 
 def __init__(self, interface, target):
@@ -281,7 +292,7 @@ class StressPerformanceTest:
 ping_cmd = 'ping -I {} {}'.format(self.interface, self.target)
 ping = subprocess.Popen(shlex.split(ping_cmd), stdout=subprocess.PIPE)
 iperf.communicate()
- 
+
 ping.terminate()
 (out, err) = ping.communicate()
 
@@ -301,9 +312,10 @@ class StressPerformanceTest:
 if 'unreachable' in line.lower():
 print(line)
 result = 1
- 
+
 return result
- 
+
+
 class Interface(socket.socket):
 """
 Simple class that provides network interface information.
@@ -367,10 +379,81 @@ class Interface(socket.socket):
 return self._read_data("device/label")
 
 
+def get_test_parameters(args, environ, config_filename):
+ # Decide the actual values for test parameters, which can come
+ # from one of three possible sources: a config file, command-line
+ # arguments, or environment variables.
+ # - If command-line args were given, they take precedence
+ # - Next come environment variables, if set.
+ # - Last, values in the config file are used if present.
+
+ params = {"test_target_ftp": None,
+ "test_user": None,
+ "test_pass": None,
+ "test_target_iperf": None}
+
+ #First (try to) load values from config file
+ config = configparser.SafeConfigParser()
+
+ try:
+ with open(config_filename) as config_file:
+ config.readfp(config_file)
+ params["test_target_ftp"] = config.get("FTP", "Target")
+ params["test_user"] = config.get("FTP", "User")
+ params["test_pass"] = config.get("FTP", "Pass")
+ params["test_target_iperf"] = config.get("IPERF", "Target")
+ except FileNotFoundError as err:
+ pass # No biggie, we can still get configs from elsewhere
+
+ # Next see if we have environment variables to override the config file
+ # "partial" overrides are not allowed; if an env variable is missing,
+ # we won't use this at all.
+ if all([param.upper() in os.environ for param in params.keys()]):
+ for key in params.keys():
+ params[key] = os.environ[key.upper()]
+
+ # Finally, see if we have the command-line arguments that are the ultimate
+ # override. Again, we will only override if we have all of them.
+ if args.target and args.username and args.password:
+ params["test_target_ftp"] = args.target
+ params["test_user"] = args.username
+ params["test_pass"] = args.password
+ params["test_target_iperf"] = args.target
+
+ return params
+
+
 def interface_test(args):
 if not "test_type" in vars(args):
 return
 
+ # Determine whether to use the default or user-supplied config
+ # file name.
+ DEFAULT_CFG = "/etc/checkbox.d/network.cfg"
+ if not "config" in vars(args):
+ config_filename = DEFAULT_CFG
+ else:
+ config_filename = args.config
+
+ # Get the actual test data from one of three possible sources
+ test_parameters = get_test_parameters(args, os.environ, config_filename)
+
+ test_user = test_parameters["test_user"]
+ test_pass = test_parameters["test_pass"]
+ if (args.test_type.lower() == "iperf" or
+ args.test_type.lower() == "stress"):
+ test_target = test_parameters["test_target_iperf"]
+ else:
+ test_target = test_parameters["test_target_ftp"]
+
+ # Validate that we got reasonable values
+ if not test_target or "example.com" in test_target:
+ # Default values found in config file
+ logging.error("Please supply target via: %s", config_filename)
+ sys.exit(1)
+
+ # Testing begins here!
+ #
 # Check and make sure that interface is indeed connected
 try:
 cmd = "ip link set dev %s up" % args.interface
@@ -382,37 +465,6 @@ def interface_test(args):
 # Give interface enough time to get DHCP address
 time.sleep(10)
 
- # Open Network config file
- DEFAULT_CFG = "/etc/checkbox.d/network.cfg"
- if not "config" in vars(args):
- config_file = DEFAULT_CFG
- else:
- config_file = args.config
-
- config = configparser.SafeConfigParser()
- config.readfp(open(config_file))
-
- # Set default network config options
- test_target = args.target
- test_user = args.username
- test_pass = args.password
-
- if test_target is None:
- # Set FTP parameters based on config file
- test_target = config.get("FTP", "Target")
- test_user = config.get("FTP", "User")
- test_pass = config.get("FTP", "Pass")
-
- if (args.test_type.lower() == "iperf" or
- args.test_type.lower() == "stress"):
- test_target = config.get("IPERF", "Target")
-
- if "example.com" in test_target:
- # Default values found in config file
- logging.error("Please supply target via: %s", config_file)
- sys.exit(1)
-
-
 result = 0
 # Stop all other interfaces
 extra_interfaces = \
@@ -439,13 +491,15 @@ def interface_test(args):
 result = ftp_benchmark.run()
 
 elif args.test_type.lower() == "iperf":
- iperf_benchmark = IPerfPerformanceTest(args.interface, test_target)
+ iperf_benchmark = IPerfPerformanceTest(args.interface, test_target, 
+ args.fail_threshold)
 result = iperf_benchmark.run()
 
 elif args.test_type.lower() == "stress":
- stress_benchmark = StressPerformanceTest(args.interface, test_target)
+ stress_benchmark = StressPerformanceTest(args.interface,
+ test_target)
 result = stress_benchmark.run()
- 
+
 for iface in extra_interfaces:
 logging.debug("Restoring interface:%s", iface)
 try:
@@ -457,6 +511,7 @@ def interface_test(args):
 
 return result
 
+
 def interface_info(args):
 
 info_set = ""
@@ -476,17 +531,53 @@ def interface_info(args):
 
 def main():
 
- intro_message = "Network module\n\nThis script provides benchmarking " \
- + "and information for a specified network interface.\n\n\n" \
- + "Example NIC information usage:\nnetwork info -i eth0 --max-speed " \
- + "\n\nFor running ftp benchmark test: \nnetwork test -i eth0 -t ftp " \
- + "--target 192.168.0.1 --username USERID --password PASSW0RD " \
- + "--filesize-2\n\nPlease note that this script can use configuration " \
- + "values supplied via a config file.\nExample config file:\n[FTP]\n" \
- + "Target: 192.168.1.23\nUser: FTPUser\nPass:PassW0Rd\n" \
- + "[IPERF]\nTarget: 192.168.1.45\n**NOTE**\nDefault config location " \
- + "is /etc/checkbox.d/network.cfg"
+ intro_message = """
+Network module
 
+This script provides benchmarking and information for a specified network
+interface.
+
+Example NIC information usage:
+network info -i eth0 --max-speed
+
+For running ftp benchmark test:
+network test -i eth0 -t ftp
+--target 192.168.0.1 --username USERID --password PASSW0RD
+--filesize-2
+
+Configuration
+=============
+
+Configuration can be supplied in three different ways, with the following
+priorities:
+
+1- Command-line parameters (see above).
+2- Environment variables (example will follow).
+3- Configuration file (example will follow).
+ Default config location is /etc/checkbox.d/network.cfg
+
+Environment variables
+=====================
+ALL environment variables must be defined, even if empty, for them to be
+picked up. The variables are:
+TEST_TARGET_FTP
+TEST_USER
+TEST_PASS
+TEST_TARGET_IPERF
+
+example config file
+===================
+[FTP]
+
+Target: 192.168.1.23
+User: FTPUser
+Pass:PassW0Rd
+
+[IPERF]
+Target: 192.168.1.45
+**NOTE**
+
+"""
 
 parser = ArgumentParser(
 description=intro_message, formatter_class=RawTextHelpFormatter)
@@ -502,7 +593,7 @@ def main():
 test_parser.add_argument(
 '-i', '--interface', type=str, required=True)
 test_parser.add_argument(
- '-t', '--test_type', type=str, 
+ '-t', '--test_type', type=str,
 choices=("ftp", "iperf", "stress"), default="ftp",
 help=("[FTP *Default*]"))
 test_parser.add_argument('--target', type=str)
@@ -517,7 +608,12 @@ def main():
 '--config', type=str,
 default="/etc/checkbox.d/network.cfg",
 help="Supply config file for target/host network parameters")
-
+ test_parser.add_argument(
+ '--fail-threshold', type=int,
+ default=40,
+ help=("IPERF Test ONLY. Set the failure threshold (Percent of maximum "
+ "theoretical bandwidth) as a number like 80. (Default is "
+ "%(default)s)"))
 
 # Sub info options
 info_parser.add_argument(
diff --git a/provider_bin/network_bandwidth_test b/bin/network_bandwidth_test
index c9b1dfb..c9b1dfb 100755
--- a/provider_bin/network_bandwidth_test
+++ b/bin/network_bandwidth_test
diff --git a/provider_bin/network_check b/bin/network_check
index 82c00d9..82c00d9 100755
--- a/provider_bin/network_check
+++ b/bin/network_check
diff --git a/provider_bin/network_device_info b/bin/network_device_info
index b8c0267..b8c0267 100755
--- a/provider_bin/network_device_info
+++ b/bin/network_device_info
diff --git a/provider_bin/network_info b/bin/network_info
index 2e5fae3..2e5fae3 100755
--- a/provider_bin/network_info
+++ b/bin/network_info
diff --git a/provider_bin/network_ntp_test b/bin/network_ntp_test
index 6e2ccf8..6e2ccf8 100755
--- a/provider_bin/network_ntp_test
+++ b/bin/network_ntp_test
diff --git a/provider_bin/network_printer_test b/bin/network_printer_test
index 19d98d2..19d98d2 100755
--- a/provider_bin/network_printer_test
+++ b/bin/network_printer_test
diff --git a/provider_bin/network_reconnect_resume_test b/bin/network_reconnect_resume_test
index 8861eb6..8861eb6 100755
--- a/provider_bin/network_reconnect_resume_test
+++ b/bin/network_reconnect_resume_test
diff --git a/provider_bin/network_restart b/bin/network_restart
index 31f1da7..31f1da7 100755
--- a/provider_bin/network_restart
+++ b/bin/network_restart
diff --git a/provider_bin/network_wait b/bin/network_wait
index 34e31fe..34e31fe 100755
--- a/provider_bin/network_wait
+++ b/bin/network_wait
diff --git a/provider_bin/obex_send b/bin/obex_send
index b9de23f..b9de23f 100755
--- a/provider_bin/obex_send
+++ b/bin/obex_send
diff --git a/provider_bin/optical_detect b/bin/optical_detect
index f1fe94b..f1fe94b 100755
--- a/provider_bin/optical_detect
+++ b/bin/optical_detect
diff --git a/provider_bin/optical_read_test b/bin/optical_read_test
index b3cf23d..b3cf23d 100755
--- a/provider_bin/optical_read_test
+++ b/bin/optical_read_test
diff --git a/provider_bin/optical_write_test b/bin/optical_write_test
index ced0081..d3f772b 100755
--- a/provider_bin/optical_write_test
+++ b/bin/optical_write_test
@@ -49,11 +49,20 @@ generate_iso(){
 }
 
 burn_iso(){
- #Burn the ISO with wodim
+ # Burn the ISO with the appropriate tool
 echo "Sleeping 10 seconds in case drive is not yet ready ..."
 sleep 10
 echo "Beginning image burn ..."
- wodim -eject dev=$OPTICAL_DRIVE $ISO_NAME
+ if [ "$OPTICAL_TYPE" == 'cd' ]
+ then
+ wodim -eject dev=$OPTICAL_DRIVE $ISO_NAME
+ elif [ "$OPTICAL_TYPE" == 'dvd' ] || [ "$OPTICAL_TYPE" == 'bd' ]
+ then
+ growisofs -dvd-compat -Z $OPTICAL_DRIVE=$ISO_NAME
+ else
+ echo "Invalid type specified '$OPTICAL_TYPE'"
+ exit 1
+ fi
 rt=$?
 return $rt
 }
@@ -87,7 +96,7 @@ check_disk(){
 
 echo "Deleting original data files ..."
 rm -rf $SAMPLE_FILE
- if [ ! -z "$(mount | grep $OPTICAL_DRIVE)" ]; then
+ if [ -n "$(mount | grep $OPTICAL_DRIVE)" ]; then
 MOUNT_PT=$(mount | grep $OPTICAL_DRIVE | awk '{print $3}')
 echo "Disk is mounted to $MOUNT_PT"
 else
@@ -133,6 +142,12 @@ else
 OPTICAL_DRIVE='/dev/sr0'
 fi 
 
+if [ -n "$2" ]; then
+ OPTICAL_TYPE=$2
+else
+ OPTICAL_TYPE='cd'
+fi
+
 create_working_dirs || failed "Failed to create working directories"
 get_sample_data || failed "Failed to copy sample data"
 generate_md5 || failed "Failed to generate initial md5"
diff --git a/provider_bin/piglit_test b/bin/piglit_test
index f03e628..f03e628 100755
--- a/provider_bin/piglit_test
+++ b/bin/piglit_test
diff --git a/provider_bin/pm_log_check b/bin/pm_log_check
index cb75685..cb75685 100755
--- a/provider_bin/pm_log_check
+++ b/bin/pm_log_check
diff --git a/provider_bin/pm_test b/bin/pm_test
index 18c0def..18c0def 100755
--- a/provider_bin/pm_test
+++ b/bin/pm_test
diff --git a/provider_bin/process_wait b/bin/process_wait
index 6107d1b..6107d1b 100755
--- a/provider_bin/process_wait
+++ b/bin/process_wait
diff --git a/provider_bin/pts_run b/bin/pts_run
index 7b4440e..7b4440e 100755
--- a/provider_bin/pts_run
+++ b/bin/pts_run
diff --git a/bin/pulse-active-port-change b/bin/pulse-active-port-change
new file mode 100755
index 0000000..ce977a6
--- /dev/null
+++ b/bin/pulse-active-port-change
@@ -0,0 +1,136 @@
+#!/usr/bin/env python3
+# This file is part of Checkbox.
+#
+# Copyright 2014 Canonical Ltd.
+# Written by:
+# Zygmunt Krynicki <zygmunt.krynicki@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/>.
+"""
+pulse-active-port-change
+========================
+
+This script checks if the active port on either sinks (speakers or headphones)
+or sources (microphones, webcams) is changed after an appropriate device is
+plugged into the DUT. The script is fully automatic and either times out after
+30 seconds or returns as soon as the change is detected.
+
+The script monitors pulse audio events with `pactl subscribe`. Any changes to
+sinks (or sources, depending on the mode) are treated as a possible match. A
+match is verified by running `pactl list sinks` (or `pactl list sources`) and
+constructing a set of pairs (sink-source-name, sink-source-active-port). Any
+change to the computed set, as compared to the initially computed set, is
+considered a match.
+
+Due to the algorithm used, it will also detect things like USB headsets, HDMI
+monitors/speakers, webcams, etc.
+
+The script depends on:
+ python3-checkbox-support
+Which depends on:
+ python3-pyparsing
+"""
+import argparse
+import os
+import pty
+import signal
+import subprocess
+
+from checkbox_support.parsers.pactl import parse_pactl_output
+
+
+class AudioPlugDetection:
+
+ def __init__(self, timeout, mode):
+ # store parameters
+ self.timeout = timeout
+ self.mode = mode
+ # get the un-localized environment
+ env = dict(os.environb)
+ env[b'LANG'] = b''
+ env[b'LANGUAGE'] = b''
+ env[b'LC_ALL'] = b'C.UTF-8'
+ self.unlocalized_env = env
+ # set SIGALRM handler
+ signal.signal(signal.SIGALRM, self.on_timeout)
+
+ def get_sound_config(self):
+ text = subprocess.check_output(
+ ["pactl", "list", self.mode], # either 'sources' or 'sinks'
+ env=self.unlocalized_env, universal_newlines=True)
+ doc = parse_pactl_output(text)
+ cfg = set()
+ for record in doc.record_list:
+ for attr in record.attribute_list:
+ if attr.name == "Active Port":
+ cfg.add((record.name, attr.value))
+ return cfg
+
+ def on_timeout(self, signum, frame):
+ print("Time is up")
+ raise SystemExit(1)
+
+ @classmethod
+ def main(cls):
+ parser = argparse.ArgumentParser(
+ description=__doc__.split("")[0],
+ epilog=__doc__.split("")[1],
+ formatter_class=argparse.RawDescriptionHelpFormatter)
+ parser.add_argument(
+ 'mode', choices=['sinks', 'sources'],
+ help='Monitor either sinks or sources')
+ parser.add_argument(
+ '-t', '--timeout', type=int, default=30,
+ help='Timeout after which the script fails')
+ ns = parser.parse_args()
+ return cls(ns.timeout, ns.mode).run()
+
+ def run(self):
+ found = False
+ if self.mode == 'sinks':
+ look_for = "Event 'change' on sink #"
+ elif self.mode == 'sources':
+ look_for = "Event 'change' on source #"
+ else:
+ assert False
+ # Get the initial / baseline configuration
+ initial_cfg = self.get_sound_config()
+ print("Starting with config: {}".format(initial_cfg))
+ print("You have {} seconds to plug something".format(self.timeout))
+ # Start the timer
+ signal.alarm(self.timeout)
+ # run subscribe in a pty as it doesn't fflush() after every event
+ pid, master_fd = pty.fork()
+ if pid == 0:
+ os.execlpe("pactl", "pactl", "subscribe", self.unlocalized_env)
+ else:
+ child_stream = os.fdopen(master_fd, "rt", encoding='UTF-8')
+ try:
+ for line in child_stream:
+ if line.startswith(look_for):
+ new_cfg = self.get_sound_config()
+ print("Now using config: {}".format(new_cfg))
+ if new_cfg != initial_cfg:
+ print("It seems to work!")
+ found = True
+ break
+ except KeyboardInterrupt:
+ pass
+ finally:
+ os.kill(pid, signal.SIGTERM)
+ os.close(master_fd)
+ return 0 if found else 1
+
+
+if __name__ == "__main__":
+ raise SystemExit(AudioPlugDetection.main())
diff --git a/provider_bin/removable_storage_test b/bin/removable_storage_test
index 81c11f8..81c11f8 100755
--- a/provider_bin/removable_storage_test
+++ b/bin/removable_storage_test
diff --git a/provider_bin/removable_storage_watcher b/bin/removable_storage_watcher
index 97fd071..97fd071 100755
--- a/provider_bin/removable_storage_watcher
+++ b/bin/removable_storage_watcher
diff --git a/provider_bin/rendercheck_test b/bin/rendercheck_test
index f7d907c..f7d907c 100755
--- a/provider_bin/rendercheck_test
+++ b/bin/rendercheck_test
diff --git a/provider_bin/resolution_test b/bin/resolution_test
index a50868b..a50868b 100755
--- a/provider_bin/resolution_test
+++ b/bin/resolution_test
diff --git a/provider_bin/rotation_test b/bin/rotation_test
index 8fcf727..8fcf727 100755
--- a/provider_bin/rotation_test
+++ b/bin/rotation_test
diff --git a/provider_bin/run_templates b/bin/run_templates
index 9e8bd2a..9e8bd2a 100755
--- a/provider_bin/run_templates
+++ b/bin/run_templates
diff --git a/provider_bin/samba_test b/bin/samba_test
index a9a0bfe..a9a0bfe 100755
--- a/provider_bin/samba_test
+++ b/bin/samba_test
diff --git a/bin/screenshot_validation b/bin/screenshot_validation
new file mode 100755
index 0000000..5529f79
--- /dev/null
+++ b/bin/screenshot_validation
@@ -0,0 +1,161 @@
+#!/usr/bin/env python2.7
+# Copyright 2014 Canonical Ltd.
+# Written by:
+# Sylvain Pineau <sylvain.pineau@canonical.com>
+#
+# This program 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.
+#
+# This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import absolute_import, print_function
+
+import argparse
+import imghdr
+import os
+
+import cv2
+
+
+def create_capture(args):
+ try:
+ device_no = int(os.path.realpath(args.device)[-1])
+ except ValueError:
+ raise SystemExit(
+ "ERROR: video source not found: {}".format(args.device))
+ cap = cv2.VideoCapture(device_no)
+ # The camera driver will adjust the capture size
+ cap.set(cv2.cv.CV_CAP_PROP_FRAME_WIDTH, args.width)
+ cap.set(cv2.cv.CV_CAP_PROP_FRAME_HEIGHT, args.height)
+ if cap is None or not cap.isOpened():
+ raise SystemExit(
+ "ERROR: unable to open video source: {}".format(args.device))
+ return cap
+
+parser = argparse.ArgumentParser(
+ description='''
+Automatically validates a screenshot captured with an external camera using
+OpenCV ORB detection and a FLANN Matcher (Fast Approximate Nearest Neighbor
+Search Library)
+
+Put your camera (HD recommended) in front of your monitor.
+A query image (the INPUT positional argument) is displayed on your primary
+device and several captures (see -F) are analyzed to find a positive match.
+
+On success returns 0. Otherwise a non-zero value is returned and a
+diagnostic message is printed on standard error.
+''',
+ formatter_class=argparse.RawDescriptionHelpFormatter
+)
+parser.add_argument('input',
+ metavar='INPUT',
+ help='Input file to use as query image')
+parser.add_argument('--min_matches',
+ type=int,
+ default=20,
+ help='Minimum threshold value to validate a \
+ positive match')
+parser.add_argument('-F', '--frames',
+ type=int,
+ default=10,
+ help='Set the number of frames to capture and analyze \
+ Minimum: 3')
+parser.add_argument('-d', '--device',
+ default='/dev/video0',
+ help='Set the device to use')
+parser.add_argument('--height',
+ type=int,
+ default=900,
+ help='Set the capture height')
+parser.add_argument('--width',
+ type=int,
+ default=1600,
+ help='Set the capture width')
+parser.add_argument('-o', '--output',
+ default=None,
+ help='Save the screenshot to the specified filename')
+args = parser.parse_args()
+
+if args.frames < 3:
+ parser.print_help()
+ raise SystemExit(1)
+if not imghdr.what(args.input):
+ raise SystemExit(
+ "ERROR: unable to read the input file: {}".format(args.input))
+queryImage = cv2.imread(args.input, cv2.CV_LOAD_IMAGE_GRAYSCALE)
+
+cv2.namedWindow("test", cv2.WND_PROP_FULLSCREEN)
+cv2.setWindowProperty("test",
+ cv2.WND_PROP_FULLSCREEN,
+ cv2.cv.CV_WINDOW_FULLSCREEN)
+cv2.imshow("test", queryImage)
+cv2.waitKey(1000)
+
+# Initiate ORB features detector
+orb = cv2.ORB(nfeatures=100000)
+
+# Find the keypoints and descriptors with ORB
+kp1, des1 = orb.detectAndCompute(queryImage, None)
+
+# Use the FLANN Matcher (Fast Approximate Nearest Neighbor Search Library)
+flann_params = dict(algorithm=6, # FLANN_INDEX_LSH
+ table_number=6,
+ key_size=12,
+ multi_probe_level=1)
+
+flann = cv2.FlannBasedMatcher(flann_params, {})
+
+source = 0
+cap = create_capture(args)
+results = []
+img = None
+
+for i in range(args.frames):
+
+ ret, img = cap.read()
+ if ret is False:
+ raise SystemExit(
+ "ERROR: unable to capture from video source: {}".format(source))
+ trainImage = cv2.cvtColor(img, cv2.COLOR_BGR2GRAY)
+
+ # Find the keypoints and descriptors with ORB
+ kp2, des2 = orb.detectAndCompute(trainImage, None)
+ if des2 is None:
+ raise SystemExit(
+ "ERROR: Not enough keypoints in video capture, aborting...")
+
+ matches = flann.knnMatch(des1, des2, k=2)
+
+ # store all the good matches as per Lowe's ratio test
+ good_matches = [m[0] for m in matches if len(m) == 2 and
+ m[0].distance < m[1].distance * 0.7]
+
+ results.append(len(good_matches))
+ cv2.waitKey(1000)
+
+cv2.destroyAllWindows()
+
+if args.output:
+ cv2.imwrite(args.output, img)
+ print('Screenshot saved to: {}'.format(args.output))
+
+# Remove Max and Min values from results
+results.remove(max(results))
+results.remove(min(results))
+
+avg = sum(results) / len(results)
+
+if avg > args.min_matches:
+ print("Match found! ({} > {})".format(avg, args.min_matches))
+else:
+ raise SystemExit(
+ "ERROR: Not enough matches are found - {} < {}".format(
+ avg,
+ args.min_matches))
diff --git a/provider_bin/sleep_test b/bin/sleep_test
index f63ab06..f63ab06 100755
--- a/provider_bin/sleep_test
+++ b/bin/sleep_test
diff --git a/bin/sleep_test_log_check b/bin/sleep_test_log_check
new file mode 100755
index 0000000..aae7556
--- /dev/null
+++ b/bin/sleep_test_log_check
@@ -0,0 +1,201 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
+# This file is part of Checkbox.
+#
+# Copyright 2014 Canonical Ltd.
+#
+# Authors
+# Jeff Lane <jeffrey.lane@canonical.com>
+# Daniel Manrique<daniel.manrique@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/>.
+
+
+'''
+This script is used to parse the log generated by fwts and check it for certain
+errors detected during testing. It expects that this is a log file created by
+fwts at runtime using the -l <log name> option.
+
+It's written now specifically for checking ater the fwts s3 and s4 tests but
+can be adapted to look for other tests, or all tests.
+'''
+
+import sys
+import collections
+import re
+
+from argparse import ArgumentParser
+import logging
+
+# Definitions of when a level starts, how a failure looks,
+# and when a level ends.
+start_level_re = r'^(?P<level>.+) failures: (?P<numfails>NONE|\d+)$'
+start_level_re = re.compile(start_level_re)
+failure_re = re.compile(r'^ (?P<test>(s3|s4)): (?P<details>.+)$')
+end_level_re = re.compile(r"$^")
+
+
+def parse_summary(summary, results):
+ """
+ Parses an entire "Test Failure Summary" section, which contains a short
+ summary of failures observed per level. Returns nothing, but adds the
+ results to the passed results dictionary.
+
+ :param summary:
+ A list of lines comprised in this summary section
+
+ :param results:
+ The results dictionary into which to put the end result. Should be a
+ dict with keys for each level, the values are dicts with keys for each
+ test (s3, s4) which in turn contain a list of all the failures observed
+ for that level and test.
+ """
+ current_level = None
+ current_acum = []
+
+ for logline in summary:
+ level_matches = start_level_re.search(logline)
+ if level_matches:
+ logging.debug("Found a level: %s", level_matches.group('level'))
+ current_level = level_matches.group('level')
+ elif end_level_re.search(logline) and current_level:
+ if current_level:
+ logging.debug("Current level (%s) has %s",
+ current_level, current_acum)
+ # By passing results[current_level] a key in results will be
+ # created for every level we see, regardless of whether it
+ # reports failures or not. This is OK because we can later
+ # check results' keys to ensure we saw at least one level; if
+ # results has no keys, it could mean a malformed fwts log file.
+ parse_level(current_acum, results[current_level])
+ else:
+ logging.debug("Discarding junk")
+ current_acum = []
+ current_level = None
+ else:
+ current_acum.append(logline)
+
+
+def parse_level(level_lines, level_results):
+ """
+ Parses the level's lines, appending the failures to the level's results.
+ level_results is a dictionary with a key per test type (s3, s4, and so on).
+ Returns nothing, but adds the results to the passed results dictionary for
+ this level.
+
+ :param level_lines:
+ A list of lines comprised in this level's list of failures.
+
+ : param level_results:
+ A dictionary containing this level's results. Should be a dict with
+ keys for each test, to which the failures for the level will be
+ appended.
+ """
+ for failureline in level_lines:
+ failure_matches = failure_re.search(failureline)
+ if failure_matches:
+ test = failure_matches.group('test')
+ details = failure_matches.group('details')
+ logging.debug("fail %s was %s", test, details)
+ level_results[test].append(details)
+
+
+def main():
+ parser = ArgumentParser()
+ parser.add_argument('-d', '--debug',
+ action='store_const',
+ const=logging.DEBUG,
+ default=logging.INFO,
+ help="Show debugging information.")
+ parser.add_argument('-v', '--verbose',
+ action='store_true',
+ default=False,
+ help="Display each error discovered. May provide \
+ very long output. Also, this option will only \
+ provide a list of UNIQUE errors encountered in \
+ the log file. It will not display duplicates. \
+ Default is [%(default)s]")
+ parser.add_argument('test',
+ action='store',
+ choices=['s3', 's4'],
+ help='The test to check (s3 or s4)')
+ parser.add_argument('logfile',
+ action='store',
+ help='The log file to parse')
+
+ args = parser.parse_args()
+
+ logging.basicConfig(level=args.debug)
+
+ #Create a generator and get our lines
+ log = (line.rstrip() for line in open(args.logfile, 'rt', encoding="UTF-8"))
+
+ # End result will be a dictionary with a key per level, value is another
+ # dictionary with a key per test (s3, s4, ...) and a list of all failures
+ # for each test. Duplicates are possible, because we should also indicate
+ # the number of instances for each failure.
+ results = collections.defaultdict(lambda: collections.defaultdict(list))
+
+ sum_acum = []
+ summaries_found = 0
+
+ # Start parsing the fwts log. Gather each "Test Failure Summary" section
+ # and when it's complete, pass it to the parse_summary function to extract
+ # levels and tests.
+ for logline in log:
+ if "Test Failure Summary" in logline:
+ parse_summary(sum_acum, results)
+ summaries_found += 1
+ sum_acum = []
+ else:
+ sum_acum.append(logline)
+ # We reached the end, so add the last accumulated summary
+ if sum_acum:
+ parse_summary(sum_acum, results)
+
+ # Report what I found
+ for level in sorted(results.keys()):
+ if results[level]: # Yes, we can have an empty level. We may have
+ # seen the levelheader but had it report no
+ # failures.
+ print("{} failures:".format(level))
+ for test in results[level].keys():
+ print(" {}: {} failures".format(test,
+ len(results[level][test])))
+ if args.verbose:
+ print('='*40)
+ counts = collections.Counter(results[level][test])
+ for failure in counts:
+ print(" {} (x {})".format(failure, counts[failure]))
+
+ # Decide on the outcome based on the collected information
+ if not summaries_found:
+ logging.error("No fwts test summaries found, "
+ "possible malformed fwts log file")
+ return_code = 2
+ elif not results.keys(): # If it has no keys, means we didn't see any
+ # FWTS levels
+ logging.error("None of the summaries contained failure levels, "
+ "possible malformed fwts log file")
+ return_code = 2
+ elif any(results.values()): # If any of the results' levels has errors
+ return_code = 1
+ else:
+ print("No errors detected")
+ return_code = 0
+
+ return return_code
+
+if __name__ == '__main__':
+ sys.exit(main())
diff --git a/provider_bin/sleep_time_check b/bin/sleep_time_check
index 6c85c9f..6c85c9f 100755
--- a/provider_bin/sleep_time_check
+++ b/bin/sleep_time_check
diff --git a/provider_bin/sources_test b/bin/sources_test
index a63c5b9..a63c5b9 100755
--- a/provider_bin/sources_test
+++ b/bin/sources_test
diff --git a/provider_bin/spindown b/bin/spindown
index bb8e0f4..bb8e0f4 100755
--- a/provider_bin/spindown
+++ b/bin/spindown
diff --git a/provider_bin/storage_test b/bin/storage_test
index 54e604f..54e604f 100755
--- a/provider_bin/storage_test
+++ b/bin/storage_test
diff --git a/provider_bin/tomcat_test b/bin/tomcat_test
index 70cdb8c..70cdb8c 100755
--- a/provider_bin/tomcat_test
+++ b/bin/tomcat_test
diff --git a/provider_bin/touchpad_driver_info b/bin/touchpad_driver_info
index 3f38968..3f38968 100755
--- a/provider_bin/touchpad_driver_info
+++ b/bin/touchpad_driver_info
diff --git a/provider_bin/touchpad_test b/bin/touchpad_test
index 814f0c2..814f0c2 100755
--- a/provider_bin/touchpad_test
+++ b/bin/touchpad_test
diff --git a/provider_bin/udisks2_monitor b/bin/udisks2_monitor
index 5b58a68..5b58a68 100755
--- a/provider_bin/udisks2_monitor
+++ b/bin/udisks2_monitor
diff --git a/provider_bin/virtualization b/bin/virtualization
index c12cd87..486a554 100755
--- a/provider_bin/virtualization
+++ b/bin/virtualization
@@ -3,10 +3,11 @@
 """
 Script to test virtualization functionality
 
-Copyright (C) 2013 Canonical Ltd.
+Copyright (C) 2013, 2014 Canonical Ltd.
 
 Authors
 Jeff Marcom <jeff.marcom@canonical.com>
+ Daniel Manrique <roadmr@ubuntu.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License version 3,
@@ -31,9 +32,9 @@ import lsb_release
 import shlex
 import signal
 from subprocess import (
- Popen, 
- PIPE, 
- CalledProcessError, 
+ Popen,
+ PIPE,
+ CalledProcessError,
 check_output,
 call
 )
@@ -43,6 +44,8 @@ import tarfile
 import time
 import urllib.request
 
+DEFAULT_TIMEOUT = 500
+
 
 class XENTest(object):
 pass
@@ -79,8 +82,8 @@ class KVMTest(object):
 # Attempt download
 try:
 resp = urllib.request.urlretrieve(image_url, cloud_iso)
- except urllib.error.HTTPError as exception:
- logging.exception("Failed download of image from:", image_url)
+ except (IOError, OSError, urllib.error.HTTPError) as exception:
+ logging.error("Failed download of image from %s: %s", image_url, exception)
 return False
 
 # Unpack img file from tar
@@ -106,19 +109,18 @@ class KVMTest(object):
 netrange = "10.0.0.0/8"
 image_ip = "10.0.0.1"
 hostfwd = "tcp::2222-:22"
- cloud_disk = "" 
+ cloud_disk = ""
 
 # Should we attach the cloud config disk
 if os.path.isfile("seed.iso"):
 logging.debug("Attaching Cloud config disk")
 cloud_disk = "-drive file=seed.iso,if=virtio"
 
-
 if re.match("(arm.*|aarch64)", self.arch):
- uname = check_output(['uname','-r'], universal_newlines=True)
+ uname = check_output(['uname', '-r'], universal_newlines=True)
 cloud_disk = cloud_disk.replace("virtio", "sd")
- params = 'qemu-system-arm -machine vexpress-a15 -cpu cortex-a15 -enable-kvm -m {} -kernel /boot/vmlinuz -append "console=ttyAMA0 earlyprintk=serial root=/dev/mmcblk0 ro rootfstype=ext4" -serial stdio -dtb /lib/firmware/{}/device-tree/vexpress-v2p-ca15-tc1.dtb -initrd /boot/initrd.img -net nic -net user,net={},host={},hostfwd={} -drive file={},if=sd,cache=writeback {} -display none -nographic'.format(uname, "256", netrange,image_ip, hostfwd, data_disk, cloud_disk)
- else: 
+ params = 'qemu-system-arm -machine vexpress-a15 -cpu cortex-a15 -enable-kvm -m {} -kernel /boot/vmlinuz -append "console=ttyAMA0 earlyprintk=serial root=/dev/mmcblk0 ro rootfstype=ext4" -serial stdio -dtb /lib/firmware/{}/device-tree/vexpress-v2p-ca15-tc1.dtb -initrd /boot/initrd.img -net nic -net user,net={},host={},hostfwd={} -drive file={},if=sd,cache=writeback {} -display none -nographic'.format(uname, "256", netrange, image_ip, hostfwd, data_disk, cloud_disk)
+ else:
 params = \
 '''
 qemu-system-x86_64 -machine accel=kvm:tcg -m {0} -net nic 
@@ -139,7 +141,8 @@ class KVMTest(object):
 
 if checkbox_dir is not None:
 self.debug_file = os.path.join(checkbox_dir, self.debug_file)
-
+ logging.info("Storing VM console output in {}".format(
+ os.path.realpath(self.debug_file)))
 # Open VM STDERR/STDOUT log file for writing
 try:
 file = open(self.debug_file, 'w')
@@ -185,13 +188,12 @@ final_message: CERTIFICATION BOOT COMPLETE
 # Create Data ISO hosting user & meta cloud config data
 try:
 iso_build = check_output(
- ['genisoimage', '-output', 'seed.iso', '-volid', 
- 'cidata', '-joliet', '-rock', 'user-data', 'meta-data'],
+ ['genisoimage', '-output', 'seed.iso', '-volid',
+ 'cidata', '-joliet', '-rock', 'user-data', 'meta-data'],
 universal_newlines=True)
 except CalledProcessError as exception:
 logging.exception("Cloud data disk creation failed")
 
-
 def start(self):
 logging.debug('Starting KVM Test')
 status = 1
@@ -202,12 +204,12 @@ final_message: CERTIFICATION BOOT COMPLETE
 
 os.chmod(temp_dir, 0o744)
 os.chdir(temp_dir)
- if self.image is None:
+ if not self.image:
 logging.debug('No image specified, downloading one now.')
 # Download cloud image
 self.image = self.download_image()
 
- if os.path.isfile(self.image):
+ if self.image and os.path.isfile(self.image):
 
 if "cloud" in self.image:
 # Will assume we need to supply cloud meta data
@@ -231,8 +233,15 @@ final_message: CERTIFICATION BOOT COMPLETE
 "initalized VM)", file=sys.stderr)
 status = 0
 else:
- print("KVM instance failed to boot", file=sys.stderr)
+ print("E: KVM instance failed to boot", file=sys.stderr)
+ print("Console output".center(72, "="),
+ file=sys.stderr)
+ with open(self.debug_file, 'r') as console_log:
+ print(console_log.read(), file=sys.stderr)
+ print("E: KVM instance failed to boot", file=sys.stderr)
 self.process.terminate()
+ elif not self.image:
+ print("Could not find downloaded image")
 else:
 print("Could not find: {}".format(self.image), file=sys.stderr)
 
@@ -246,6 +255,8 @@ def test_kvm(args):
 image = ""
 timeout = ""
 
+ # Configuration data can come from three sources.
+ # Lowest priority is the config file.
 config_file = DEFAULT_CFG
 config = configparser.SafeConfigParser()
 
@@ -254,22 +265,35 @@ def test_kvm(args):
 except IOError:
 logging.warn("No config file found")
 else:
- try: 
+ try:
 timeout = config.getfloat("KVM", "timeout")
- except ValueError: 
+ except ValueError:
 logging.warning('Invalid or Empty timeout in config file. '
- 'Falling back to default')
+ 'Falling back to default')
 except configparser.NoSectionError as e:
 logging.exception(e)
- 
+
 try:
 image = config.get("KVM", "image")
 except configparser.NoSectionError:
 logging.exception('Invalid or Empty image in config file.')
 
- if timeout == "":
+ # Next in priority are environment variables.
+ if 'KVM_TIMEOUT' in os.environ:
+ try:
+ timeout = float(os.environ['KVM_TIMEOUT'])
+ except ValueError as err:
+ logging.warning("TIMEOUT env variable: %s" % err)
+ timeout = DEFAULT_TIMEOUT
+ if 'KVM_IMAGE' in os.environ:
+ image = os.environ['KVM_IMAGE']
+
+ # Finally, highest-priority are command line arguments.
+ if args.timeout:
 timeout = args.timeout
- if image == "":
+ elif not timeout:
+ timeout = DEFAULT_TIMEOUT
+ if args.image:
 image = args.image
 
 kvm_test = KVMTest(image, timeout)
@@ -294,24 +318,24 @@ def main():
 kvm_test_parser.add_argument(
 '-i', '--image', type=str, default=None)
 kvm_test_parser.add_argument(
- '-t', '--timeout', type=int, default=500)
- kvm_test_parser.add_argument(
- '--debug', action="store_true")
+ '-t', '--timeout', type=int)
+ kvm_test_parser.add_argument('--debug', dest='log_level',
+ action="store_const", const=logging.DEBUG,
+ default=logging.INFO)
 kvm_test_parser.set_defaults(func=test_kvm)
 
 args = parser.parse_args()
- 
+
 try:
- if args.debug:
- logging.basicConfig(level=logging.DEBUG)
+ logging.basicConfig(level=args.log_level)
 except AttributeError:
- pass #avoids exception when trying to run without specifying 'kvm'
- 
- #to check if not len(sys.argv) > 1
+ pass # avoids exception when trying to run without specifying 'kvm'
+
+ # to check if not len(sys.argv) > 1
 if len(vars(args)) == 0:
 parser.print_help()
 return False
- 
+
 args.func(args)
 
 if __name__ == "__main__":
diff --git a/provider_bin/volume_test b/bin/volume_test
index d254192..d254192 100755
--- a/provider_bin/volume_test
+++ b/bin/volume_test
diff --git a/provider_bin/wifi_time2reconnect b/bin/wifi_time2reconnect
index bfaa2ce..bfaa2ce 100755
--- a/provider_bin/wifi_time2reconnect
+++ b/bin/wifi_time2reconnect
diff --git a/provider_bin/window_test b/bin/window_test
index e6bff73..e6bff73 100755
--- a/provider_bin/window_test
+++ b/bin/window_test
diff --git a/provider_bin/wireless_ext b/bin/wireless_ext
index 1d92bc0..1d92bc0 100755
--- a/provider_bin/wireless_ext
+++ b/bin/wireless_ext
diff --git a/provider_bin/xen_test b/bin/xen_test
index ed237c5..ed237c5 100755
--- a/provider_bin/xen_test
+++ b/bin/xen_test
diff --git a/provider_bin/xml_sanitize b/bin/xml_sanitize
index 0cdbc8e..0cdbc8e 100755
--- a/provider_bin/xml_sanitize
+++ b/bin/xml_sanitize
diff --git a/provider_bin/xrandr_cycle b/bin/xrandr_cycle
index ef20c41..ef20c41 100755
--- a/provider_bin/xrandr_cycle
+++ b/bin/xrandr_cycle
diff --git a/checkbox.provider b/checkbox.provider
deleted file mode 100644
index 5e311f4..0000000
--- a/checkbox.provider
+++ /dev/null
@@ -1,4 +0,0 @@
-[PlainBox Provider]
-name = 2013.com.canonical:checkbox
-location = /usr/lib/plainbox-providers-1/checkbox/
-description = CheckBox provider
diff --git a/provider_data/images/JPEG_Color_Image_Ubuntu.jpg b/data/images/JPEG_Color_Image_Ubuntu.jpg
index 51c598d..51c598d 100644
--- a/provider_data/images/JPEG_Color_Image_Ubuntu.jpg
+++ b/data/images/JPEG_Color_Image_Ubuntu.jpg
diff --git a/provider_data/images/PNG_Color_Image_Ubuntu.png b/data/images/PNG_Color_Image_Ubuntu.png
index 93d6a8f..93d6a8f 100644
--- a/provider_data/images/PNG_Color_Image_Ubuntu.png
+++ b/data/images/PNG_Color_Image_Ubuntu.png
diff --git a/data/images/logo_Ubuntu_stacked_black.png b/data/images/logo_Ubuntu_stacked_black.png
new file mode 100644
index 0000000..c807a37
--- /dev/null
+++ b/data/images/logo_Ubuntu_stacked_black.png
diff --git a/provider_bin/resolution_test.qml b/data/resolution_test.qml
index b718bd0..b718bd0 100644
--- a/provider_bin/resolution_test.qml
+++ b/data/resolution_test.qml
diff --git a/provider_data/settings/shutter.xml b/data/settings/shutter.xml
index f6f1c0a..f6f1c0a 100644
--- a/provider_data/settings/shutter.xml
+++ b/data/settings/shutter.xml
diff --git a/provider_data/video/Ogg_Theora_Video.ogv b/data/video/Ogg_Theora_Video.ogv
index b756164..b756164 100644
--- a/provider_data/video/Ogg_Theora_Video.ogv
+++ b/data/video/Ogg_Theora_Video.ogv
diff --git a/provider_data/video/Quicktime_Video.mov b/data/video/Quicktime_Video.mov
index 884da14..884da14 100644
--- a/provider_data/video/Quicktime_Video.mov
+++ b/data/video/Quicktime_Video.mov
diff --git a/provider_data/websites/Flash_Video.flv b/data/websites/Flash_Video.flv
index 0b506e8..0b506e8 100644
--- a/provider_data/websites/Flash_Video.flv
+++ b/data/websites/Flash_Video.flv
diff --git a/data/websites/PNG_Color_Image_Ubuntu.png b/data/websites/PNG_Color_Image_Ubuntu.png
new file mode 120000
index 0000000..8c4535a
--- /dev/null
+++ b/data/websites/PNG_Color_Image_Ubuntu.png
@@ -0,0 +1 @@
+../images/PNG_Color_Image_Ubuntu.png \ No newline at end of file
diff --git a/provider_data/websites/SWF_Test.as b/data/websites/SWF_Test.as
index 41a7df2..41a7df2 100644
--- a/provider_data/websites/SWF_Test.as
+++ b/data/websites/SWF_Test.as
diff --git a/provider_data/websites/SWF_Test.swf b/data/websites/SWF_Test.swf
index 92968c0..92968c0 100644
--- a/provider_data/websites/SWF_Test.swf
+++ b/data/websites/SWF_Test.swf
diff --git a/provider_data/websites/flashtest.html b/data/websites/flashtest.html
index b53f7a7..b53f7a7 100644
--- a/provider_data/websites/flashtest.html
+++ b/data/websites/flashtest.html
diff --git a/provider_data/websites/flashvideo.html b/data/websites/flashvideo.html
index 7a1b02e..7a1b02e 100644
--- a/provider_data/websites/flashvideo.html
+++ b/data/websites/flashvideo.html
diff --git a/provider_data/websites/html5_video.html b/data/websites/html5_video.html
index 51220df..51220df 100644
--- a/provider_data/websites/html5_video.html
+++ b/data/websites/html5_video.html
diff --git a/provider_data/websites/testindex.html b/data/websites/testindex.html
index c3e5d5a..c3e5d5a 100644
--- a/provider_data/websites/testindex.html
+++ b/data/websites/testindex.html
diff --git a/provider_jobs/audio.txt.in b/jobs/audio.txt.in
index 82d2bf3..5ed60e1 100644
--- a/provider_jobs/audio.txt.in
+++ b/jobs/audio.txt.in
@@ -1,5 +1,5 @@
 plugin: shell
-name: audio/list_devices
+id: audio/list_devices
 estimated_duration: 1.0
 requires:
 device.category == 'AUDIO'
@@ -8,7 +8,7 @@ command: cat /proc/asound/cards
 _description: Test to detect audio devices
 
 plugin: user-interact-verify
-name: audio/playback_auto
+id: audio/playback_auto
 estimated_duration: 5.0
 depends: audio/list_devices
 requires:
@@ -16,7 +16,7 @@ requires:
 package.name == 'alsa-base'
 package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
 package.name == 'pulseaudio-utils'
-command: audio_settings store --file=$CHECKBOX_DATA/pulseaudio_settings; audio_settings set --device=pci --volume=50; gst_pipeline_test -t 2 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! autoaudiosink'; EXIT_CODE=$?; audio_settings restore --file=$CHECKBOX_DATA/pulseaudio_settings; exit $EXIT_CODE
+command: audio_settings store --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; audio_settings set --device=pci --volume=50; gst_pipeline_test -t 2 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! autoaudiosink'; EXIT_CODE=$?; audio_settings restore --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; exit $EXIT_CODE
 _description:
 PURPOSE:
 This test will check that internal speakers work correctly
@@ -28,7 +28,7 @@ _description:
 Did you hear a tone?
 
 plugin: user-interact-verify
-name: audio/playback_hdmi
+id: audio/playback_hdmi
 estimated_duration: 30.0
 requires:
 device.category == 'AUDIO'
@@ -36,7 +36,7 @@ requires:
 package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
 package.name == 'pulseaudio-utils'
 command:
- audio_settings store --verbose --file=$CHECKBOX_DATA/pulseaudio_settings; audio_settings set --verbose --device=hdmi --volume=50; gst_pipeline_test -t 2 --device hdmi 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! autoaudiosink'; EXIT_CODE=$?; audio_settings restore --verbose --file=$CHECKBOX_DATA/pulseaudio_settings; exit $EXIT_CODE
+ audio_settings store --verbose --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; audio_settings set --verbose --device=hdmi --volume=50; gst_pipeline_test -t 2 --device hdmi 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! autoaudiosink'; EXIT_CODE=$?; audio_settings restore --verbose --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; exit $EXIT_CODE
 _description:
 PURPOSE:
 HDMI audio interface verification
@@ -47,7 +47,7 @@ _description:
 Did you hear the sound from the HDMI device?
 
 plugin: user-interact-verify
-name: audio/playback_displayport
+id: audio/playback_displayport
 estimated_duration: 30.0
 requires:
 device.category == 'AUDIO'
@@ -55,7 +55,7 @@ requires:
 package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
 package.name == 'pulseaudio-utils'
 command:
- audio_settings store --verbose --file=$CHECKBOX_DATA/pulseaudio_settings; audio_settings set --verbose --device=hdmi --volume=50; gst_pipeline_test -t 2 --device hdmi 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! autoaudiosink'; EXIT_CODE=$?; audio_settings restore --verbose --file=$CHECKBOX_DATA/pulseaudio_settings; exit $EXIT_CODE
+ audio_settings store --verbose --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; audio_settings set --verbose --device=hdmi --volume=50; gst_pipeline_test -t 2 --device hdmi 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! autoaudiosink'; EXIT_CODE=$?; audio_settings restore --verbose --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; exit $EXIT_CODE
 _description:
 PURPOSE:
 DisplayPort audio interface verification
@@ -66,7 +66,7 @@ _description:
 Did you hear the sound from the DisplayPort device?
 
 plugin: user-interact-verify
-name: audio/playback_headphones
+id: audio/playback_headphones
 estimated_duration: 20.0
 depends: audio/list_devices
 requires:
@@ -74,7 +74,7 @@ requires:
 package.name == 'alsa-base'
 package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
 package.name == 'pulseaudio-utils'
-command: audio_settings store --file=$CHECKBOX_DATA/pulseaudio_settings; audio_settings set --device=pci --volume=50; gst_pipeline_test -t 2 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! autoaudiosink'; EXIT_CODE=$?; audio_settings restore --file=$CHECKBOX_DATA/pulseaudio_settings; exit $EXIT_CODE
+command: audio_settings store --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; audio_settings set --device=pci --volume=50; gst_pipeline_test -t 2 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! autoaudiosink'; EXIT_CODE=$?; audio_settings restore --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; exit $EXIT_CODE
 _description:
 PURPOSE:
 This test will check that headphones connector works correctly
@@ -85,7 +85,7 @@ _description:
 Did you hear a sound through the headphones and did the sound play without any distortion, clicks or other strange noises from your headphones?
 
 plugin: user-interact-verify
-name: audio/alsa_record_playback_internal
+id: audio/alsa_record_playback_internal
 estimated_duration: 20.0
 depends: audio/playback_auto
 requires:
@@ -93,7 +93,7 @@ requires:
 package.name == 'alsa-base'
 package.name == 'pulseaudio-utils'
 package.name == 'gstreamer1.0-plugins-good' or package.name == 'gstreamer0.10-plugins-good'
-command: audio_settings store --file=$CHECKBOX_DATA/pulseaudio_settings; audio_settings set --device=pci --volume=50; alsa_record_playback; EXIT_CODE=$?; audio_settings restore --file=$CHECKBOX_DATA/pulseaudio_settings; exit $EXIT_CODE
+command: audio_settings store --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; audio_settings set --device=pci --volume=50; alsa_record_playback; EXIT_CODE=$?; audio_settings restore --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; exit $EXIT_CODE
 _description:
 PURPOSE:
 This test will check that recording sound using the onboard microphone works correctly
@@ -105,7 +105,7 @@ _description:
 Did you hear your speech played back?
 
 plugin: user-interact-verify
-name: audio/alsa_record_playback_external
+id: audio/alsa_record_playback_external
 estimated_duration: 20.0
 depends: audio/playback_headphones
 requires:
@@ -113,7 +113,7 @@ requires:
 package.name == 'alsa-base'
 package.name == 'pulseaudio-utils'
 package.name == 'gstreamer1.0-plugins-good' or package.name == 'gstreamer0.10-plugins-good'
-command: audio_settings store --file=$CHECKBOX_DATA/pulseaudio_settings; audio_settings set --device=pci --volume=50; alsa_record_playback; EXIT_CODE=$?; audio_settings restore --file=$CHECKBOX_DATA/pulseaudio_settings; exit $EXIT_CODE
+command: audio_settings store --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; audio_settings set --device=pci --volume=50; alsa_record_playback; EXIT_CODE=$?; audio_settings restore --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; exit $EXIT_CODE
 _description:
 PURPOSE:
 This test will check that recording sound using an external microphone works correctly
@@ -125,13 +125,14 @@ _description:
 Did you hear your speech played back?
 
 plugin: user-interact-verify
-name: audio/alsa_record_playback_usb
+id: audio/alsa_record_playback_usb
+estimated_duration: 120.0
 requires:
 device.category == 'AUDIO'
 package.name == 'alsa-base'
 package.name == 'pulseaudio-utils'
 package.name == 'gstreamer1.0-plugins-good' or package.name == 'gstreamer0.10-plugins-good'
-command: audio_settings store --file=$CHECKBOX_DATA/pulseaudio_settings; audio_settings set --device=usb --volume=50; alsa_record_playback; EXIT_CODE=$?; audio_settings restore --file=$CHECKBOX_DATA/pulseaudio_settings; exit $EXIT_CODE
+command: audio_settings store --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; audio_settings set --device=usb --volume=50; alsa_record_playback; EXIT_CODE=$?; audio_settings restore --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; exit $EXIT_CODE
 _description:
 PURPOSE:
 This test will check that a USB audio device works correctly
@@ -143,7 +144,7 @@ _description:
 Did you hear your speech played back through the USB headphones?
 
 plugin: shell
-name: audio/alsa_record_playback_automated
+id: audio/alsa_record_playback_automated
 estimated_duration: 10.0
 requires:
 package.name == 'python3-gi'
@@ -159,24 +160,24 @@ _description:
 default input.
 
 plugin: shell
-name: audio/alsa_info_collect
+id: audio/alsa_info_collect
 estimated_duration: 2.0
-command: alsa_info --no-dialog --no-upload --output ${CHECKBOX_DATA}/alsa_info.log
+command: alsa_info --no-dialog --no-upload --output ${PLAINBOX_SESSION_SHARE}/alsa_info.log
 _description:
 Collect audio-related system information. This data can be used to
 simulate this computer's audio subsystem and perform more detailed tests
 under a controlled environment.
 
 plugin: attachment
-name: audio/alsa_info_attachment
+id: audio/alsa_info_attachment
 depends: audio/alsa_info_collect
 estimated_duration: 1.0
-command: [ -e ${CHECKBOX_DATA}/alsa_info.log ] && cat ${CHECKBOX_DATA}/alsa_info.log
+command: [ -e ${PLAINBOX_SESSION_SHARE}/alsa_info.log ] && cat ${PLAINBOX_SESSION_SHARE}/alsa_info.log
 _description:
 Attaches the audio hardware data collection log to the results.
 
 plugin: user-interact-verify
-name: audio/channels
+id: audio/channels
 estimated_duration: 20.0
 command: speaker-test -c 2 -l 1 -t wav
 _description:
@@ -188,7 +189,7 @@ _description:
 You should clearly hear a voice from the different audio channels
 
 plugin: shell
-name: audio/check_volume
+id: audio/check_volume
 estimated_duration: 1.0
 requires:
 package.name == 'pulseaudio-utils'
@@ -203,7 +204,7 @@ _description:
 volume or mute before running this test.
 
 plugin: manual
-name: audio/external-lineout
+id: audio/external-lineout
 estimated_duration: 30.0
 _description:
 PURPOSE:
@@ -217,14 +218,14 @@ _description:
 2. Do you hear the sound coming out on the corresponding channel?
 
 plugin: user-interact-verify
-name: audio/external-linein
+id: audio/external-linein
 estimated_duration: 120.0
 requires:
 device.category == 'AUDIO'
 package.name == 'alsa-base'
 package.name == 'pulseaudio-utils'
 package.name == 'gstreamer1.0-plugins-good' or package.name == 'gstreamer0.10-plugins-good'
-command: audio_settings store --file=$CHECKBOX_DATA/pulseaudio_settings; audio_settings set --device=pci --volume=50; alsa_record_playback; EXIT_CODE=$?; audio_settings restore --file=$CHECKBOX_DATA/pulseaudio_settings; exit $EXIT_CODE
+command: audio_settings store --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; audio_settings set --device=pci --volume=50; alsa_record_playback; EXIT_CODE=$?; audio_settings restore --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; exit $EXIT_CODE
 _description:
 PURPOSE:
 Check that external line in connection works correctly
@@ -235,8 +236,49 @@ _description:
 VERIFICATION:
 Did you hear your recording?
 
+plugin: user-interact
+id: audio/speaker-headphone-plug-detection
+estimated_duration: 60.0
+requires:
+ device.category == 'AUDIO'
+ package.name == 'pulseaudio-utils'
+command: pulse-active-port-change sinks
+_description:
+ PURPOSE:
+ Check that system detects speakers or headphones being plugged in
+ STEPS:
+ 1. Prepare a pair of headphones or speakers with a standard 3.5mm jack
+ 2. Locate the speaker / headphone jack on the device under test
+ 3. Run the test (you have 30 seconds from now on)
+ 4. Plug headphones or speakers into the appropriate jack
+ 5. Unplug the device for subsequent tests.
+ VERIFICATION:
+ Verification is automatic, no action is required.
+ The test times out after 30 seconds (and fails in that case).
+
+plugin: user-interact
+id: audio/microphone-plug-detection
+estimated_duration: 60.0
+requires:
+ device.category == 'AUDIO'
+ package.name == 'pulseaudio-utils'
+command: pulse-active-port-change sources
+_description:
+ PURPOSE:
+ Check that system detects a microphone being plugged in
+ STEPS:
+ 1. Prepare a microphone with a standard 3.5mm jack
+ 2. Locate the microphone jack on the device under test.
+ Keep in mind that it may be shared with the headphone jack.
+ 3. Run the test (you have 30 seconds from now on)
+ 4. Plug the microphone into the appropriate jack
+ 5. Unplug the device for subsequent tests.
+ VERIFICATION:
+ Verification is automatic, no action is required.
+ The test times out after 30 seconds (and fails in that case).
+
 plugin: user-interact-verify
-name: audio/balance_internal_speaker
+id: audio/balance_internal_speaker
 estimated_duration: 20.0
 depends: audio/playback_auto
 requires:
@@ -244,7 +286,7 @@ requires:
 package.name == 'alsa-base'
 package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
 package.name == 'pulseaudio-utils'
-command: audio_settings store --file=$CHECKBOX_DATA/pulseaudio_settings; audio_settings set --device=pci --volume=50; gst_pipeline_test -t 10 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! autoaudiosink'; EXIT_CODE=$?; audio_settings restore --file=$CHECKBOX_DATA/pulseaudio_settings; exit $EXIT_CODE
+command: audio_settings store --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; audio_settings set --device=pci --volume=50; gst_pipeline_test -t 10 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! autoaudiosink'; EXIT_CODE=$?; audio_settings restore --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; exit $EXIT_CODE
 _description:
 PURPOSE:
 Check that balance control works correctly on internal speakers
@@ -257,7 +299,7 @@ _description:
 Does the slider move smoothly, as well as being followed by the setting by the actual audio output?
 
 plugin: user-interact-verify
-name: audio/balance_headphones
+id: audio/balance_headphones
 depends: audio/playback_headphones
 estimated_duration: 30.0
 requires:
@@ -265,7 +307,7 @@ requires:
 package.name == 'alsa-base'
 package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
 package.name == 'pulseaudio-utils'
-command: audio_settings store --file=$CHECKBOX_DATA/pulseaudio_settings; audio_settings set --device=pci --volume=50; gst_pipeline_test -t 10 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! autoaudiosink'; EXIT_CODE=$?; audio_settings restore --file=$CHECKBOX_DATA/pulseaudio_settings; exit $EXIT_CODE
+command: audio_settings store --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; audio_settings set --device=pci --volume=50; gst_pipeline_test -t 10 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! autoaudiosink'; EXIT_CODE=$?; audio_settings restore --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; exit $EXIT_CODE
 _description:
 PURPOSE:
 Check that balance control works correctly on external headphone
@@ -276,3 +318,77 @@ _description:
 4. Check that actual headphone audio balance follows your setting.
 VERIFICATION:
 Does the slider move smoothly, as well as being followed by the setting by the actual audio output?
+
+plugin: shell
+id: audio/list_devices_after_suspend_30_cycles
+estimated_duration: 1.0
+depends: power-management/suspend_30_cycles
+requires:
+ device.category == 'AUDIO'
+ package.name == 'alsa-base'
+command: cat /proc/asound/cards
+_description: Test to detect audio devices after suspending 30 times.
+
+plugin: user-interact-verify
+id: audio/playback_auto_after_suspend_30_cycles
+estimated_duration: 5.0
+depends: audio/list_devices power-management/suspend_30_cycles
+requires:
+ device.category == 'AUDIO'
+ package.name == 'alsa-base'
+ package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
+ package.name == 'pulseaudio-utils'
+command: audio_settings store --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; audio_settings set --device=pci --volume=50; gst_pipeline_test -t 2 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! autoaudiosink'; EXIT_CODE=$?; audio_settings restore --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; exit $EXIT_CODE
+_description:
+ PURPOSE:
+ This test will check that internal speakers work correctly after suspending 30 times.
+ STEPS:
+ 1. Make sure that no external speakers or headphones are connected
+ If testing a desktop, external speakers are allowed
+ 2. Click the Test button to play a brief tone on your audio device
+ VERIFICATION:
+ Did you hear a tone?
+
+plugin: shell
+id: audio/alsa_record_playback_automated_after_suspend_30_cycles
+estimated_duration: 10.0
+depends: power-management/suspend_30_cycles
+requires:
+ package.name == 'python3-gi'
+ package.name == 'gir1.2-gstreamer-1.0'
+ package.name == 'libgstreamer1.0-0'
+ package.name == 'gstreamer1.0-plugins-good'
+ package.name == 'gstreamer1.0-pulseaudio'
+ package.name == 'alsa-base'
+ device.category == 'AUDIO'
+command: audio_test
+_description:
+ Play back a sound on the default output and listen for it on the
+ default input, after suspending 30 times.
+
+plugin: shell
+id: audio/check_volume_after_suspend_30_cycles
+estimated_duration: 1.0
+depends: power-management/suspend_30_cycles
+requires:
+ package.name == 'pulseaudio-utils'
+ device.category == 'AUDIO'
+command: volume_test --minvol 1 --maxvol 100
+_description:
+ This test will verify that the volume levels are at an acceptable level on
+ your local system. The test will validate that the volume is greater than
+ or equal to minvol and less than or equal to maxvol for all sources (inputs)
+ and sinks (outputs) recognized by PulseAudio. It will also validate that the
+ active source and sink are not muted. You should not manually adjust the
+ volume or mute before running this test.
+
+plugin: shell
+id: audio/audio_after_suspend_30_cycles
+estimated_duration: 1.0
+depends: power-management/suspend_30_cycles
+requires:
+ device.category == 'AUDIO'
+ package.name == 'alsa-base'
+_description: Record mixer settings after suspending 30 times.
+command:
+ audio_settings store --file=$PLAINBOX_SESSION_SHARE/audio_settings_after_suspend_30_cycles; diff $PLAINBOX_SESSION_SHARE/audio_settings_before_suspend $PLAINBOX_SESSION_SHARE/audio_settings_after_suspend_30_cycles
diff --git a/provider_jobs/benchmarks.txt.in b/jobs/benchmarks.txt.in
index 7a46724..efc19db 100644
--- a/provider_jobs/benchmarks.txt.in
+++ b/jobs/benchmarks.txt.in
@@ -1,11 +1,11 @@
 plugin: local
-name: benchmarks/disk/hdparm-read
+id: benchmarks/disk/hdparm-read
 requires: device.category == 'DISK'
 _description: Benchmark for each disk
 command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=DISK"'
 plugin: shell
- name: benchmarks/disk/hdparm-read_`ls /sys$path/block`
+ id: benchmarks/disk/hdparm-read_`ls /sys$path/block`
 requires: device.path == "$path"
 user: root
 command: hdparm -t /dev/`ls /sys$path/block | sed 's|!|/|'` | sed -e :a -e '$!N;s/\n/ /;ta' | sed 's/.*= *//'
@@ -13,13 +13,13 @@ command:
 EOF
 
 plugin: local
-name: benchmarks/disk/hdparm-cache-read
+id: benchmarks/disk/hdparm-cache-read
 requires: device.category == 'DISK'
 _description: Benchmark for each disk
 command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=DISK"'
 plugin: shell
- name: benchmarks/disk/hdparm-cache-read_`ls /sys$path/block`
+ id: benchmarks/disk/hdparm-cache-read_`ls /sys$path/block`
 requires: device.path == "$path"
 user: root
 command: hdparm -T /dev/`ls /sys$path/block | sed 's|!|/|'` | sed -e :a -e '$!N;s/\n/ /;ta' | sed 's/.*= *//'
@@ -27,7 +27,7 @@ command:
 EOF
 
 plugin: shell
-name: benchmarks/graphics/gtkperf
+id: benchmarks/graphics/gtkperf
 depends: graphics/xorg-version
 requires: package.name == 'gtkperf'
 command: python3 -c 'import re,sys,subprocess; (s, o) = subprocess.getstatusoutput("gtkperf -a"); [sys.exit(1) for i in [s] if s]; m = re.search("Total time:\s+(.*)\n", o); [print(i.group(1)+" Seconds") for i in [m] if m]'
@@ -36,42 +36,42 @@ _description:
 Run gtkperf to make sure that GTK based test cases work
 
 plugin: shell
-name: benchmarks/graphics/render-bench
+id: benchmarks/graphics/render-bench
 requires: package.name == 'render-bench'
 command: /usr/bin/time -f "%e Seconds" render_bench 2>&1 >/dev/null
 estimated_duration: 52.000
 _description: Run Render-Bench XRender/Imlib2 benchmark
 
 plugin: shell
-name: benchmarks/graphics/qgears2-Xrender-gearsfancy
+id: benchmarks/graphics/qgears2-Xrender-gearsfancy
 requires: package.name == 'phoronix-test-suite'
 command: PRESET_OPTIONS="qgears2.render-backend=1; qgears2.test-mode=0" pts_run qgears2
 estimated_duration: 180.000
 _description: Run Qgears2 XRender Extension gearsfancy benchmark
 
 plugin: shell
-name: benchmarks/graphics/qgears2-Xrender-compo
+id: benchmarks/graphics/qgears2-Xrender-compo
 requires: package.name == 'phoronix-test-suite'
 command: PRESET_OPTIONS="qgears2.render-backend=1; qgears2.test-mode=2" pts_run qgears2
 estimated_duration: 31.500
 _description: Run Qgears2 XRender Extension image scaling benchmark
 
 plugin: shell
-name: benchmarks/graphics/qgears2-gl-gearsfancy
+id: benchmarks/graphics/qgears2-gl-gearsfancy
 requires: package.name == 'phoronix-test-suite'
 command: PRESET_OPTIONS="qgears2.render-backend=2; qgears2.test-mode=0" pts_run qgears2
 estimated_duration: 52.000
 _description: Run Qgears2 OpenGL gearsfancy benchmark
 
 plugin: shell
-name: benchmarks/graphics/qgears2-gl-compo
+id: benchmarks/graphics/qgears2-gl-compo
 requires: package.name == 'phoronix-test-suite'
 command: PRESET_OPTIONS="qgears2.render-backend=2; qgears2.test-mode=2" pts_run qgears2
 estimated_duration: 23.000
 _description: Run Qgears2 OpenGL image scaling benchmark
 
 plugin: shell
-name: benchmarks/graphics/glmark2-es2
+id: benchmarks/graphics/glmark2-es2
 requires:
 package.name == 'glmark2-es2'
 'arm' in cpuinfo.type
@@ -80,7 +80,7 @@ command:
 _description: Run GLmark2-ES2 benchmark
 
 plugin: shell
-name: benchmarks/graphics/glmark2
+id: benchmarks/graphics/glmark2
 requires:
 package.name == 'glmark2'
 cpuinfo.platform in ("i386", "x86_64")
@@ -90,7 +90,7 @@ estimated_duration: 306.000
 _description: Run GLmark2 benchmark
 
 plugin: shell
-name: benchmarks/graphics/globs
+id: benchmarks/graphics/globs
 requires:
 package.name == 'globs'
 cpuinfo.platform in ("i386", "x86_64")
@@ -99,140 +99,140 @@ estimated_duration: 53.500
 _description: Run globs benchmark
 
 plugin: shell
-name: benchmarks/graphics/unigine-sanctuary
+id: benchmarks/graphics/unigine-sanctuary
 requires: package.name == 'phoronix-test-suite'
 command: pts_run unigine-sanctuary
 _description: Run Unigine Santuary benchmark
 
 plugin: shell
-name: benchmarks/graphics/unigine-tropics
+id: benchmarks/graphics/unigine-tropics
 requires: package.name == 'phoronix-test-suite'
 command: pts_run unigine-tropics
 _description: Run Unigine Tropics benchmark
 
 plugin: shell
-name: benchmarks/graphics/unigine-heaven
+id: benchmarks/graphics/unigine-heaven
 requires: package.name == 'phoronix-test-suite'
 command: pts_run unigine-heaven
 _description: Run Unigine Heaven benchmark
 
 plugin: shell
-name: benchmarks/graphics/lightsmark
+id: benchmarks/graphics/lightsmark
 requires: package.name == 'phoronix-test-suite'
 command: pts_run lightsmark
 _description: Run Lightsmark benchmark
 
 plugin: shell
-name: benchmarks/memory/cachebench-read
+id: benchmarks/memory/cachebench-read
 requires: package.name == 'phoronix-test-suite'
 command: PRESET_OPTIONS="cachebench.test=0" pts_run cachebench
 _description: Run Cachebench Read benchmark
 
 plugin: shell
-name: benchmarks/memory/cachebench-write
+id: benchmarks/memory/cachebench-write
 requires: package.name == 'phoronix-test-suite'
 command: PRESET_OPTIONS="cachebench.test=1" pts_run cachebench
 _description: Run Cachebench Write benchmark
 
 plugin: shell
-name: benchmarks/memory/cachebench-read-modify-write
+id: benchmarks/memory/cachebench-read-modify-write
 requires: package.name == 'phoronix-test-suite'
 command: PRESET_OPTIONS="cachebench.test=2" pts_run cachebench
 _description: Run Cachebench Read / Modify / Write benchmark
 
 plugin: shell
-name: benchmarks/memory/stream-copy
+id: benchmarks/memory/stream-copy
 requires: package.name == 'phoronix-test-suite'
 command: PRESET_OPTIONS="stream.run-type=0" pts_run stream
 _description: Run Stream Copy benchmark
 
 plugin: shell
-name: benchmarks/memory/stream-scale
+id: benchmarks/memory/stream-scale
 requires: package.name == 'phoronix-test-suite'
 command: PRESET_OPTIONS="stream.run-type=1" pts_run stream
 _description: Run Stream Scale benchmark
 
 plugin: shell
-name: benchmarks/memory/stream-add
+id: benchmarks/memory/stream-add
 requires: package.name == 'phoronix-test-suite'
 command: PRESET_OPTIONS="stream.run-type=2" pts_run stream
 _description: Run Stream Add benchmark
 
 plugin: shell
-name: benchmarks/memory/stream-triad
+id: benchmarks/memory/stream-triad
 requires: package.name == 'phoronix-test-suite'
 command: PRESET_OPTIONS="stream.run-type=3" pts_run stream
 _description: Run Stream Triad benchmark
 
 plugin: shell
-name: benchmarks/network/network-loopback
+id: benchmarks/network/network-loopback
 requires: package.name == 'phoronix-test-suite'
 command: pts_run network-loopback
 estimated_duration: 85.0
 _description: Run Network Loopback benchmark
 
 plugin: shell
-name: benchmarks/network/wifi_time_to_reconnect
+id: benchmarks/network/wifi_time_to_reconnect
 requires: device.category == 'WIRELESS'
 command: wifi_time2reconnect
 _description: Check the time needed to reconnect to a WIFI access point
 
 plugin: shell
-name: benchmarks/processor/encode-mp3
+id: benchmarks/processor/encode-mp3
 requires: package.name == 'phoronix-test-suite'
 command: pts_run encode-mp3
 _description: Run Encode MP3 benchmark
 
 plugin: shell
-name: benchmarks/processor/x264
+id: benchmarks/processor/x264
 requires: package.name == 'phoronix-test-suite'
 command: pts_run x264
 _description: Run x264 H.264/AVC encoder benchmark
 
 plugin: shell
-name: benchmarks/processor/gnupg
+id: benchmarks/processor/gnupg
 requires: package.name == 'phoronix-test-suite'
 command: pts_run gnupg
 _description: Run GnuPG benchmark
 
 plugin: shell
-name: benchmarks/processor/compress-pbzip2
+id: benchmarks/processor/compress-pbzip2
 requires: package.name == 'phoronix-test-suite'
 command: pts_run compress-pbzip2
 _description: Run Compress PBZIP2 benchmark
 
 plugin: shell
-name: benchmarks/processor/compress-7zip
+id: benchmarks/processor/compress-7zip
 requires: package.name == 'phoronix-test-suite'
 command: pts_run compress-7zip
 _description: Run Compress 7ZIP benchmark
 
 plugin: shell
-name: benchmarks/processor/n-queens
+id: benchmarks/processor/n-queens
 requires: package.name == 'phoronix-test-suite'
 command: pts_run n-queens
 _description: Run N-Queens benchmark
 
 plugin: shell
-name: benchmarks/processor/himeno
+id: benchmarks/processor/himeno
 requires: package.name == 'phoronix-test-suite'
 command: pts_run himeno
 _description: Run Himeno benchmark
 
 plugin: shell
-name: benchmarks/system/cpu_on_idle
+id: benchmarks/system/cpu_on_idle
 requires: package.name == 'sysstat'
 command: iostat -x -m 1 10 | python3 -c 'import sys, re; lines="".join(sys.stdin.readlines()); l=[float(n) for n in (re.findall("idle\n.*?(\S+)\n", lines))]; print(sum(l)/len(l),"%")'
 _description: CPU utilization on an idle system.
 
 plugin: shell
-name: benchmarks/system/disk_on_idle
+id: benchmarks/system/disk_on_idle
 requires: package.name == 'sysstat'
 command: iostat -x -m 1 10 | python3 -c 'import sys, re; lines="".join(sys.stdin.readlines()); l=[float(n) for n in (re.findall("util\n.*?(\S+)\n", lines))]; print(sum(l)/len(l),"%")'
 _description: Disk utilization on an idle system.
 
 plugin: shell
-name: benchmarks/graphics/gputest_furmark_fullscreen_1920x1080
+id: benchmarks/graphics/gputest_furmark_fullscreen_1920x1080
 requires:
 package.name == 'gputest'
 cpuinfo.platform == 'x86_64'
@@ -243,7 +243,7 @@ _description:
 Fullscreen 1920x1080 no antialiasing
 
 plugin: shell
-name: benchmarks/graphics/gputest_furmark_windowed_1024x640
+id: benchmarks/graphics/gputest_furmark_windowed_1024x640
 requires:
 package.name == 'gputest'
 cpuinfo.platform == 'x86_64'
@@ -254,7 +254,7 @@ _description:
 Windowed 1024x640 no antialiasing
 
 plugin: shell
-name: benchmarks/graphics/gputest_gimark_fullscreen_1920x1080
+id: benchmarks/graphics/gputest_gimark_fullscreen_1920x1080
 requires:
 package.name == 'gputest'
 cpuinfo.platform == 'x86_64'
@@ -265,7 +265,7 @@ _description:
 Fullscreen 1920x1080 no antialiasing
 
 plugin: shell
-name: benchmarks/graphics/gputest_gimark_windowed_1024x640
+id: benchmarks/graphics/gputest_gimark_windowed_1024x640
 requires:
 package.name == 'gputest'
 cpuinfo.platform == 'x86_64'
@@ -276,7 +276,7 @@ _description:
 Windowed 1024x640 no antialiasing
 
 plugin: shell
-name: benchmarks/graphics/gputest_tessmark_fullscreen_1920x1080
+id: benchmarks/graphics/gputest_tessmark_fullscreen_1920x1080
 requires:
 package.name == 'gputest'
 cpuinfo.platform == 'x86_64'
@@ -287,7 +287,7 @@ _description:
 Fullscreen 1920x1080 no antialiasing
 
 plugin: shell
-name: benchmarks/graphics/gputest_tessmark_windowed_1024x640
+id: benchmarks/graphics/gputest_tessmark_windowed_1024x640
 requires:
 package.name == 'gputest'
 cpuinfo.platform == 'x86_64'
diff --git a/provider_jobs/bluetooth.txt.in b/jobs/bluetooth.txt.in
index 651a841..9099e4d 100644
--- a/provider_jobs/bluetooth.txt.in
+++ b/jobs/bluetooth.txt.in
@@ -1,6 +1,7 @@
 
 plugin: shell
-name: bluetooth/detect-output
+id: bluetooth/detect-output
+estimated_duration: 1.2
 requires:
 package.name == 'bluez'
 device.category == 'BLUETOOTH'
@@ -13,7 +14,7 @@ command:
 rfkill unblock bluetooth
 sleep 3
 fi
- output=$(hcitool dev | tail -n+2 | awk '{print $2}' | tee $CHECKBOX_DATA/bluetooth_address)
+ 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"
@@ -23,8 +24,9 @@ _description:
 Automated test to store bluetooth device information in checkbox report
 
 plugin: manual
-name: bluetooth/browse-files
+id: bluetooth/browse-files
 depends: bluetooth/detect-output
+estimated_duration: 120.0
 _description:
 PURPOSE:
 This test will check that bluetooth connection works correctly
@@ -42,8 +44,9 @@ _description:
 Did all the steps work?
 
 plugin: manual
-name: bluetooth/file-transfer
+id: bluetooth/file-transfer
 depends: bluetooth/browse-files bluetooth/detect-output
+estimated_duration: 120.0
 _description:
 PURPOSE:
 This test will check that you can transfer information through a bluetooth connection
@@ -55,8 +58,27 @@ _description:
 Were all files copied correctly?
 
 plugin: user-interact-verify
-name: bluetooth/audio
+id: bluetooth/audio-a2dp
 depends: bluetooth/detect-output
+estimated_duration: 120.0
+command: audio_settings store --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; audio_settings set --device=pci --volume=50; gst_pipeline_test -t 2 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! autoaudiosink'; EXIT_CODE=$?; audio_settings restore --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; exit $EXIT_CODE
+_description:
+ PURPOSE:
+ This test will check that you can record and hear audio using a bluetooth audio device
+ STEPS:
+ 1. Enable the bluetooth headset
+ 2. Click on the sound icon
+ 3. Click "Sound Settings"
+ 4. Look for the device in the list and select it
+ 5. Set Quality to A2DP
+ 6. Click "Test" to record for five seconds and reproduce in the bluetooth device
+ VERIFICATION:
+ Did you hear the sound?
+
+plugin: user-interact-verify
+id: bluetooth/audio
+depends: bluetooth/detect-output
+estimated_duration: 120.0
 command: arecord -d 5 -D bluetooth -f S16_LE | aplay -D bluetooth -f S16_LE
 _description:
 PURPOSE:
@@ -68,13 +90,17 @@ _description:
 4. Look for the device in the list and select it
 5. In the device write the PIN code automatically chosen by the wizard
 6. The device should pair with the computer
- 7. Click "Test" to record for five seconds and reproduce in the bluetooth device
+ 7. Click the sound icon
+ 8. Click "Sound Settings"
+ 9. Select device and ensure Quality is set to "HSP/HFP"
+ 10. Click "Test" to record for five seconds and reproduce in the bluetooth device
 VERIFICATION:
 Did you hear the sound you recorded in the bluetooth
 
 plugin: user-interact-verify
-name: bluetooth/HID
+id: bluetooth/HID
 depends: bluetooth/detect-output
+estimated_duration: 120.0
 command: keyboard_test
 _description:
 PURPOSE:
diff --git a/provider_jobs/camera.txt.in b/jobs/camera.txt.in
index 9ad449b..3ba4c8c 100644
--- a/provider_jobs/camera.txt.in
+++ b/jobs/camera.txt.in
@@ -1,12 +1,14 @@
 plugin: shell
-name: camera/detect
+id: camera/detect
+estimated_duration: 1.2
 requires:
 device.category == 'CAPTURE'
 command: camera_test detect
 _description: This Automated test attempts to detect a camera.
 
 plugin: user-verify
-name: camera/display
+id: camera/display
+estimated_duration: 120.0
 depends: camera/detect
 requires:
 device.category == 'CAPTURE'
@@ -20,7 +22,8 @@ _description:
 Did you see the video capture?
 
 plugin: user-verify
-name: camera/still
+id: camera/still
+estimated_duration: 120.0
 depends: camera/detect
 requires:
 package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
@@ -37,7 +40,8 @@ _description:
 Did you see the image?
 
 plugin: shell
-name: camera/multiple-resolution-images
+id: camera/multiple-resolution-images
+estimated_duration: 1.2
 depends: camera/detect
 requires:
 package.name == 'fswebcam' or package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
diff --git a/provider_jobs/codecs.txt.in b/jobs/codecs.txt.in
index b44a379..694c781 100644
--- a/provider_jobs/codecs.txt.in
+++ b/jobs/codecs.txt.in
@@ -1,5 +1,5 @@
 plugin: user-interact-verify
-name: codecs/ogg-vorbis
+id: codecs/ogg-vorbis
 requires:
 package.name == 'gstreamer0.10-plugins-base' or package.name == 'gstreamer1.0-plugins-base'
 package.name == 'totem'
@@ -15,7 +15,7 @@ _description:
 Did the sample play correctly?
 
 plugin: user-interact-verify
-name: codecs/wav
+id: codecs/wav
 requires:
 package.name == 'gstreamer0.10-plugins-good' or package.name == 'gstreamer1.0-plugins-good'
 package.name == 'totem'
diff --git a/provider_jobs/cpu.txt.in b/jobs/cpu.txt.in
index a12f129..a88f0c4 100644
--- a/provider_jobs/cpu.txt.in
+++ b/jobs/cpu.txt.in
@@ -1,49 +1,65 @@
 plugin: shell
-name: cpu/scaling_test
+id: cpu/scaling_test
 requires:
 package.name == 'fwts'
 user: root
-environ: CHECKBOX_DATA
-command: fwts_test -t cpufreq -l ${CHECKBOX_DATA}/scaling_test.log
+environ: PLAINBOX_SESSION_SHARE
+command: fwts_test -t cpufreq -l ${PLAINBOX_SESSION_SHARE}/scaling_test.log
 _description:
 Test the CPU scaling capabilities using Firmware Test Suite (fwts cpufreq).
 
 plugin: attachment
-name: cpu/scaling_test-log-attach
+id: cpu/scaling_test-log-attach
 depends: cpu/scaling_test
-command: [[ -e ${CHECKBOX_DATA}/scaling_test.log ]] && cat ${CHECKBOX_DATA}/scaling_test.log
+command: [[ -e ${PLAINBOX_SESSION_SHARE}/scaling_test.log ]] && cat ${PLAINBOX_SESSION_SHARE}/scaling_test.log
 _description:
 Attaches the log generated by cpu/scaling_test to the results
 
 plugin: shell
-name: cpu/clocktest
+id: cpu/maxfreq_test
+requires:
+ package.name == 'fwts'
+user: root
+command: fwts_test -t maxfreq -l $PLAINBOX_SESSION_SHARE/maxfreq_test.log
+_description:
+ Test that the CPU can run at its max frequency using Firmware Test Suite (fwts cpufreq).
+
+plugin: attachment
+id: cpu/maxfreq_test-log-attach
+depends: cpu/maxfreq_test
+command: [ -e $PLAINBOX_SESSION_SHARE/maxfreq_test.log ] && cat $PLAINBOX_SESSION_SHARE/maxfreq_test.log
+_description:
+ Attaches the log generated by cpu/maxfreq_test to the results
+
+plugin: shell
+id: cpu/clocktest
 command: clocktest
 _description:
 Test for clock jitter.
 
 plugin: shell
-name: cpu/offlining_test
+id: cpu/offlining_test
 user: root
 command: cpu_offlining
 _description:
 Test offlining CPUs in a multicore system.
 
 plugin: shell
-name: cpu/topology
+id: cpu/topology
 requires: int(cpuinfo.count) > 1 and (cpuinfo.platform == 'i386' or cpuinfo.platform == 'x86_64')
 command: cpu_topology
 _description:
 This test checks cpu topology for accuracy
 
 plugin: shell
-name: cpu/frequency_governors
+id: cpu/frequency_governors
 user: root
 command: nice -n -20 frequency_governors_test --debug
 _description:
 This test checks that CPU frequency governors are obeyed when set.
 
 plugin: shell
-name: cpu/arm_vfp_support
+id: cpu/arm_vfp_support
 requires: 'arm' in cpuinfo.type
 command: grep VFP /var/log/syslog
 _description:
diff --git a/provider_jobs/daemons.txt.in b/jobs/daemons.txt.in
index ad0abf3..69a76f5 100644
--- a/provider_jobs/daemons.txt.in
+++ b/jobs/daemons.txt.in
@@ -1,66 +1,66 @@
 plugin: shell
-name: daemons/atd
+id: daemons/atd
 requires: package.name == 'at'
 command: pgrep -f '/usr/sbin/atd' >/dev/null
 _description: Test if the atd daemon is running when the package is installed.
 
 plugin: shell
-name: daemons/cron
+id: daemons/cron
 requires: package.name == 'cron'
 command: pgrep -f '/usr/sbin/cron' >/dev/null
 _description: Test if the cron daemon is running when the package is installed.
 
 plugin: shell
-name: daemons/cupsd
+id: daemons/cupsd
 requires: package.name == 'cupsys'
 command: pgrep -f '/usr/sbin/cupsd' >/dev/null
 _description: Test if the cupsd daemon is running when the package is installed.
 
 plugin: shell
-name: daemons/getty
+id: daemons/getty
 requires: package.name == 'util-linux'
 command: pgrep -f '/sbin/getty' >/dev/null
 _description: Test if the getty daemon is running when the package is installed.
 
 plugin: shell
-name: daemons/init
+id: daemons/init
 requires: package.name == 'upstart'
 command: pgrep -f '/sbin/init' >/dev/null
 _description: Test if the init daemon is running when the package is installed.
 
 plugin: shell
-name: daemons/klogd
+id: daemons/klogd
 requires: package.name == 'klogd'
 command: pgrep -f '/sbin/klogd' >/dev/null
 _description: Test if the klogd daemon is running when the package is installed.
 
 plugin: shell
-name: daemons/nmbd
+id: daemons/nmbd
 requires: package.name == 'samba'
 command: pgrep -f '/usr/sbin/nmbd' >/dev/null
 _description: Test if the nmbd daemon is running when the package is installed.
 
 plugin: shell
-name: daemons/smbd
+id: daemons/smbd
 requires: package.name == 'samba'
 command: pgrep -f '/usr/sbin/smbd' >/dev/null
 _description: Test if the smbd daemon is running when the package is installed.
 
 plugin: shell
-name: daemons/syslogd
+id: daemons/syslogd
 requires: package.name == 'syslogd'
 command: pgrep -f '/sbin/syslogd' >/dev/null
 _description: Test if the syslogd daemon is running when the package is installed.
 
 plugin: shell
-name: daemons/udevd
+id: daemons/udevd
 requires:
 package.name == 'udevd'
 command: pgrep -f '/sbin/udevd' >/dev/null
 _description: Test if the udevd daemon is running when the package is installed.
 
 plugin: shell
-name: daemons/winbindd
+id: daemons/winbindd
 requires: package.name == 'winbind'
 command: pgrep -f '/usr/sbin/winbindd' >/dev/null
 _description: Test if the winbindd daemon is running when the package is installed.
diff --git a/provider_jobs/disk.txt.in b/jobs/disk.txt.in
index 4ce8661..7e58a62 100644
--- a/provider_jobs/disk.txt.in
+++ b/jobs/disk.txt.in
@@ -1,16 +1,16 @@
 plugin: shell
-name: disk/detect
+id: disk/detect
 command: udev_resource | filter_templates -w "category=DISK" | awk -F': ' '$1 == "product" { print $2 }'
 _description: Detects and displays disks attached to the system.
 
 plugin: local
-name: disk/stats
+id: disk/stats
 requires: device.category == 'DISK'
 _description: Check stats changes for each disk
 command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=DISK"'
 plugin: shell
- name: disk/stats_`ls /sys$path/block`
+ id: disk/stats_`ls /sys$path/block`
 requires: 
 device.path == "$path"
 block_device.`ls /sys$path/block`_state != 'removable'
@@ -20,7 +20,7 @@ command:
 EOF
 
 plugin: local
-name: disk/smart
+id: disk/smart
 requires:
 package.name == 'smartmontools'
 device.category == 'DISK'
@@ -28,7 +28,7 @@ _description: SMART test
 command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=DISK"'
 plugin: shell
- name: disk/smart_`ls /sys$path/block`
+ id: disk/smart_`ls /sys$path/block`
 requires: 
 device.path == "$path"
 block_device.`ls /sys$path/block`_state != 'removable'
@@ -39,31 +39,14 @@ command:
 EOF
 
 plugin: local
-name: disk/max_diskspace_used
-requires:
- device.category == 'DISK'
-_description: Maximum disk space used during a default installation test
-command:
- cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=DISK"'
- plugin: shell
- name: disk/max_diskspace_used_`ls /sys$path/block`
- requires: 
- device.path == "$path"
- block_device.`ls /sys$path/block`_state != 'removable'
- description: Maximum disk space test for $product
- user: root
- command: max_diskspace_used `ls /sys$path/block | sed 's|!|/|'`
- EOF
-
-plugin: local
-name: disk/read_performance
+id: disk/read_performance
 requires:
 device.category == 'DISK'
 _description: Verify system storage performs at or above baseline performance
 command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=DISK"'
 plugin: shell
- name: disk/read_performance_`ls /sys$path/block`
+ id: disk/read_performance_`ls /sys$path/block`
 requires:
 device.path == "$path"
 block_device.`ls /sys$path/block`_state != 'removable'
@@ -73,14 +56,14 @@ command:
 EOF
 
 plugin: local
-name: disk/storage_devices
+id: disk/storage_devices
 requires:
 device.category == 'DISK'
 _description: Verify that storage devices, such as Fibre Channel and RAID can be detected and perform under stress.
 command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=DISK"'
 plugin: shell
- name: disk/storage_device_`ls /sys$path/block`
+ id: disk/storage_device_`ls /sys$path/block`
 user: root
 requires:
 device.path == "$path"
@@ -90,7 +73,7 @@ command:
 EOF
 
 plugin: shell
-name: disk/spindown
+id: disk/spindown
 requires: 
 device.category == 'DISK'
 package.name == 'smartmontools'
@@ -99,3 +82,19 @@ command: spindown
 _description:
 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 a bad interaction with the operating system that results in the drive constantly parked then activated. This produces excess wear on the drive, potentially leading to early failures.
 
+plugin: user-interact
+id: disk/hdd-parking
+requires: device.category == 'DISK'
+depends: input/accelerometer
+user: root
+command: hdd_parking
+_description:
+ PURPOSE:
+ This test checks that a systems drive protection mechanism works properly.
+ STEPS:
+ 1. Click on Test
+ 2. Move the system under test around, ensuring it is raised and lowered at some point.
+ VERIFICATION:
+ The verification of this test is automated. Do not change the
+ automatically selected result.
+
diff --git a/provider_jobs/esata.txt.in b/jobs/esata.txt.in
index cc6a62b..1a3e2f5 100644
--- a/provider_jobs/esata.txt.in
+++ b/jobs/esata.txt.in
@@ -1,5 +1,5 @@
 plugin: user-interact
-name: esata/insert
+id: esata/insert
 command: removable_storage_watcher insert ata_serial_esata
 _description:
 PURPOSE:
@@ -13,7 +13,7 @@ _description:
 selected result
 
 plugin: shell
-name: esata/storage-test
+id: esata/storage-test
 user: root
 depends: esata/insert
 command: removable_storage_test -s 268400000 ata_serial_esata
@@ -22,7 +22,7 @@ _description:
 eSATA HDD
 
 plugin: user-interact
-name: esata/remove
+id: esata/remove
 depends: esata/storage-test
 command: removable_storage_watcher remove ata_serial_esata
 _description:
diff --git a/provider_jobs/ethernet.txt.in b/jobs/ethernet.txt.in
index 131ba45..35de6b7 100644
--- a/provider_jobs/ethernet.txt.in
+++ b/jobs/ethernet.txt.in
@@ -1,5 +1,5 @@
 plugin: shell
-name: ethernet/detect
+id: ethernet/detect
 requires:
 device.category == 'NETWORK' or device.category == 'WIRELESS'
 package.name == 'module-init-tools'
@@ -9,7 +9,7 @@ estimated_duration: 1.2
 _description: Test to detect the available network controllers
 
 plugin: shell
-name: ethernet/info_automated
+id: ethernet/info_automated
 requires:
 package.name == 'network-manager'
 device.category == 'NETWORK'
@@ -19,7 +19,7 @@ _description:
 This is an automated test to gather some info on the current state of your network devices. If no devices are found, the test will exit with an error.
 
 plugin: user-interact-verify
-name: ethernet/wired_connection
+id: ethernet/wired_connection
 command: network_check
 estimated_duration: 1.2
 _description:
@@ -33,32 +33,33 @@ _description:
 Did a notification show and was the connection correctly established?
 
 plugin: local
-name: ethernet/multi_nic
+id: ethernet/multi_nic
 requires: device.category == 'NETWORK'
 _description: Automated test to walk multiple network cards and test each one in sequence.
 command:
 cat <<'EOF' | run_templates -s 'udev_resource | filter_templates -w "category=NETWORK" | awk "/path: / { print \$2 }" | xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do echo \$0 \$i; done"'
 plugin: shell
- name: ethernet/multi_nic_$2
+ id: ethernet/multi_nic_$2
 requires:
 package.name == 'ethtool'
 package.name == 'nmap'
 device.path == "$1"
 user: root
- command: network test -i $2 -t iperf
+ environ: TEST_TARGET_FTP TEST_TARGET_IPERF TEST_USER TEST_PASS
+ command: network test -i $2 -t iperf --fail-threshold 80
 estimated_duration: 330.0
 description:
 Testing for NIC $2
 EOF
 
 plugin: local
-name: ethernet/ethtool_info
+id: ethernet/ethtool_info
 requires:
 device.category == 'NETWORK'
 command: 
 cat <<'EOF' | run_templates -s 'udev_resource | filter_templates -w "category=NETWORK" | awk "/path: / { print \$2 }" | xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do echo \$0 \$i; done"'
 plugin: shell
- name: ethernet/ethertool_check_$2
+ id: ethernet/ethertool_check_$2
 requires: device.path == "$1"
 command: ethtool $2
 estimated_duration: 330.0
@@ -69,7 +70,7 @@ _description:
 This is an automated test to gather some info on the current state of your network devices. If no devices are found, the test will exit with an error.
 
 plugin: local
-name: ethernet/maximum_bandwidth
+id: ethernet/maximum_bandwidth
 requires:
 device.category == 'NETWORK'
 package.name == 'zenity'
@@ -78,7 +79,7 @@ command:
 cat <<'EOF' | run_templates -s 'udev_resource | filter_templates -w "category=NETWORK" | awk "/path: / { print \$2 }" | xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do echo \$0 \$i; done"'
 plugin: user-verify
 user: root
- name: ethernet/maximum_bandwidth_$2
+ id: ethernet/maximum_bandwidth_$2
 requires: device.path == "$1"
 command: network test -i $2 -t iperf 2>&1 | cat - <(echo; echo "Verify the result and click OK to decide on the outcome") | zenity --text-info --title 'ethernet max bw $2'
 estimated_duration: 330.0
@@ -96,18 +97,18 @@ _description:
 This test executes a maximum throughput test against all the ethernet devices found on the system.
 
 plugin: local
-name: ethernet/stress_performance
+id: ethernet/stress_performance
 requires:
 device.category == 'NETWORK'
 _description: Automated test that tests performance of each wired network device under stress.
 command:
 cat <<'EOF' | run_templates -s 'udev_resource | filter_templates -w "category=NETWORK" | awk "/path: / { print \$2 }" | xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do echo \$0 \$i; done"'
 plugin: shell
- name: ethernet/stress_performance_$2
+ id: ethernet/stress_performance_$2
 requires: device.path == "$1"
 user: root
 command: network test -i $2 -t stress
- estimated_duration: 330..0
+ estimated_duration: 330.0
 _description:
 This test executes iperf to generate a load on the network device and then performs a ping test to watch for dropped packets and very large latency periods.
 EOF
diff --git a/provider_jobs/expresscard.txt.in b/jobs/expresscard.txt.in
index de0da64..c45351f 100644
--- a/provider_jobs/expresscard.txt.in
+++ b/jobs/expresscard.txt.in
@@ -1,5 +1,5 @@
 plugin: manual
-name: expresscard/verification
+id: expresscard/verification
 _description:
 PURPOSE:
 This will verify that an ExpressCard slot can detect inserted devices.
diff --git a/provider_jobs/fingerprint.txt.in b/jobs/fingerprint.txt.in
index 7bf12e6..4feb543 100644
--- a/provider_jobs/fingerprint.txt.in
+++ b/jobs/fingerprint.txt.in
@@ -1,5 +1,5 @@
 plugin: manual
-name: fingerprint/login
+id: fingerprint/login
 _description:
 PURPOSE:
 This test will verify that a fingerprint reader will work properly for logging into your system. This test case assumes that there's a testing account from which test cases are run and a personal account that the tester uses to verify the fingerprint reader
@@ -14,7 +14,7 @@ _description:
 Did the authentication procedure work correctly?
 
 plugin: manual
-name: fingerprint/unlock
+id: fingerprint/unlock
 _description:
 PURPOSE:
 This test will verify that a fingerprint reader can be used to unlock a locked system.
diff --git a/provider_jobs/firewire.txt.in b/jobs/firewire.txt.in
index 343ff6a..448a1de 100644
--- a/provider_jobs/firewire.txt.in
+++ b/jobs/firewire.txt.in
@@ -1,5 +1,5 @@
 plugin: user-interact
-name: firewire/insert
+id: firewire/insert
 command: removable_storage_watcher insert firewire
 _description:
 PURPOSE:
@@ -13,7 +13,7 @@ _description:
 selected result
 
 plugin: shell
-name: firewire/storage-test
+id: firewire/storage-test
 user: root
 depends: firewire/insert
 command: removable_storage_test -s 268400000 firewire
@@ -22,7 +22,7 @@ _description:
 FireWire HDD
 
 plugin: user-interact
-name: firewire/remove
+id: firewire/remove
 depends: firewire/storage-test
 command: removable_storage_watcher remove firewire
 _description:
diff --git a/provider_jobs/firmware.txt.in b/jobs/firmware.txt.in
index 555a229..df2383c 100644
--- a/provider_jobs/firmware.txt.in
+++ b/jobs/firmware.txt.in
@@ -1,29 +1,29 @@
 plugin: local
-name: firmware/fwts
+id: firmware/fwts
 requires: package.name == 'fwts'
 _description: Automated tests for firmware using Firmware Test Suite.
 command:
 cat << 'EOF' | run_templates -s 'fwts_test --list'
 estimated_duration: 1.2
 plugin: shell
- name: firmware/fwts_$1
+ id: firmware/fwts_$1
 requires: package.name == 'fwts'
 user: root
- command: fwts_test -t $1 -l $CHECKBOX_DATA/fwts_$1.log
+ command: fwts_test -t $1 -l $PLAINBOX_SESSION_SHARE/fwts_$1.log
 _description: Run $1 test from Firmware Test Suite.
 EOF
 
 plugin: local
-name: firmware/fwts_logs
+id: firmware/fwts_logs
 requires: package.name == 'fwts'
 _description: Automated tests for firmware using Firmware Test Suite.
 command:
 cat << 'EOF' | run_templates -s 'fwts_test --list'
 estimated_duration: 1.2
 plugin: attachment
- name: firmware/fwts_$1.log
+ id: firmware/fwts_$1.log
 requires: package.name == 'fwts'
 user: root
- command: [[ -e ${CHECKBOX_DATA}/fwts_$1.log ]] && cat ${CHECKBOX_DATA}/fwts_$1.log
+ command: [[ -e ${PLAINBOX_SESSION_SHARE}/fwts_$1.log ]] && cat ${PLAINBOX_SESSION_SHARE}/fwts_$1.log
 _description: Attach log for FWTS $1 test.
 EOF
diff --git a/provider_jobs/floppy.txt.in b/jobs/floppy.txt.in
index d2fc577..002fe3f 100644
--- a/provider_jobs/floppy.txt.in
+++ b/jobs/floppy.txt.in
@@ -1,11 +1,11 @@
 plugin: local
-name: floppy/check
+id: floppy/check
 requires: device.driver == 'floppy'
 _description: Floppy test
 command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "driver=floppy"'
 plugin: shell
- name: floppy/check_`ls /sys$path/driver/*/*/*/block`
+ id: floppy/check_`ls /sys$path/driver/*/*/*/block`
 requires: device.path == "$path"
 description: Floppy test for $product
 user: root
diff --git a/provider_jobs/graphics.txt.in b/jobs/graphics.txt.in
index 2487d87..891df47 100644
--- a/provider_jobs/graphics.txt.in
+++ b/jobs/graphics.txt.in
@@ -1,18 +1,18 @@
 plugin: shell
-name: graphics/driver_version
+id: graphics/driver_version
 command: graphics_driver
 estimated_duration: 0.500
 _description: Parses Xorg.0.Log and discovers the running X driver and version
 
 plugin: shell
-name: graphics/xorg-version
+id: graphics/xorg-version
 requires: package.name == "x11-utils"
 command: xdpyinfo | grep "^X.Org version" | cut -d ':' -f 2 | tr -d ' '
 estimated_duration: 0.018
 _description: Test to output the Xorg version
 
 plugin: manual
-name: graphics/resolution-change
+id: graphics/resolution-change
 depends: graphics/xorg-version
 _description:
 PURPOSE:
@@ -27,7 +27,7 @@ _description:
 Did the resolution change as expected?
 
 plugin: shell
-name: graphics/xorg-process
+id: graphics/xorg-process
 requires:
 package.name == 'xorg'
 package.name == 'procps'
@@ -36,14 +36,14 @@ estimated_duration: 0.100
 _description: Test that the X process is running.
 
 plugin: shell
-name: graphics/xorg-failsafe
+id: graphics/xorg-failsafe
 requires: package.name == 'xorg'
 command: ! test -e /var/log/Xorg.failsafe.log
 estimated_duration: 0.030
 _description: Test that the X is not running in failsafe mode.
 
 plugin: user-verify
-name: graphics/resolution
+id: graphics/resolution
 requires:
 device.category == 'VIDEO'
 command: resolution_test
@@ -59,11 +59,11 @@ _description:
 Is this acceptable for your display?
 
 plugin: user-verify
-name: graphics/screen-resolution
+id: graphics/screen-resolution
 requires:
 device.category == 'VIDEO'
 package.name == 'qmlscene'
-command: timeout 5 qmlscene --transparent --fullscreen $CHECKBOX_SHARE/scripts/resolution_test.qml
+command: timeout 5 qmlscene --transparent --fullscreen $PLAINBOX_PROVIDER_DATA/resolution_test.qml
 estimated_duration: 10
 _description:
 PURPOSE:
@@ -74,7 +74,7 @@ _description:
 Is this acceptable for your display?
 
 plugin: shell
-name: graphics/minimum_resolution
+id: graphics/minimum_resolution
 requires:
 device.category == 'VIDEO'
 command: resolution_test --horizontal 800 --vertical 600
@@ -85,30 +85,46 @@ _description:
 .
 https://help.ubuntu.com/community/Installation/SystemRequirements
 
-name: graphics/modes
+plugin: user-verify
+id: graphics/maximum_resolution
+requires:
+ device.category == 'VIDEO'
+ package.name == 'zenity'
+command: zenity --info --text "Maximum resolution: $(xrandr -q |grep -A 1 "connected\( primary\)* [0-9]" |tail -1 |awk '{print $1}')"
+estimated_duration: 10
+_description:
+ PURPOSE:
+ This test will verify the display is operating at its maximum supported resolution 
+ STEPS:
+ 1. Consult the system's specifications and locate the screen's maximum supported resolution.
+ 2. Click on Test to display the maximum resolution that can be used by Ubuntu on the current display.
+ VERIFICATION:
+ Is this the display's maximum resolution?
+
+id: graphics/modes
 plugin: shell
 command: graphics_modes_info
 estimated_duration: 0.250
 _description: Collect info on graphics modes (screen resolution and refresh rate)
 
-name: graphics/color_depth
+id: graphics/color_depth
 plugin: shell
 command: color_depth_info
 estimated_duration: 0.150
 _description: Collect info on color depth and pixel format.
 
-name: graphics/fresh_rate
+id: graphics/fresh_rate
 plugin: shell
 command: fresh_rate_info
 _description: Collect info on fresh rate.
 
-name: graphics/graphic_memory
+id: graphics/graphic_memory
 plugin: shell
 command: graphic_memory_info
 _description: Collect info on graphic memory.
 
 plugin: user-verify
-name: graphics/display
+id: graphics/display
 requires: 
 package.name == 'xorg'
 package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
@@ -122,16 +138,16 @@ _description:
 Do you see color bars and static?
 
 plugin: shell
-name: graphics/VESA_drivers_not_in_use
+id: graphics/VESA_drivers_not_in_use
 command: cat /var/log/Xorg.0.log | perl -e '$a=0;while(<>){$a++ if /Loading.*vesa_drv\.so/;$a-- if /Unloading.*vesa/&&$a}exit 1 if $a'
 estimated_duration: 0.011
 _description: Check that VESA drivers are not in use
 
 plugin: user-verify
-name: graphics/cycle_resolution
+id: graphics/cycle_resolution
 requires: package.name == 'xorg'
 depends: graphics/VESA_drivers_not_in_use
-command: xrandr_cycle --screenshot-dir $CHECKBOX_DATA
+command: xrandr_cycle --screenshot-dir $PLAINBOX_SESSION_SHARE
 estimated_duration: 250.000
 _description:
 PURPOSE:
@@ -142,7 +158,7 @@ _description:
 Did the screen appear to be working for each mode?
 
 plugin: user-verify
-name: graphics/rotation
+id: graphics/rotation
 depends: graphics/xorg-version
 command: rotation_test
 estimated_duration: 20.000
@@ -156,21 +172,21 @@ _description:
 Did the display rotation take place without without permanent screen corruption?
 
 plugin: shell
-name: graphics/compiz_check
+id: graphics/compiz_check
 requires: package.name == 'nux-tools'
-command: set -o pipefail; /usr/lib/nux/unity_support_test -c -p | ansi_parser
+command: ! /usr/lib/nux/unity_support_test -c -p | ansi_parser | grep ":\(\s\+\)no$"
 estimated_duration: 0.130
 _description: Check that hardware is able to run compiz
 
 plugin: shell
-name: graphics/unity-support
+id: graphics/unity-support
 requires: package.name == 'nux-tools'
-command: set -o pipefail; /usr/lib/nux/unity_support_test -p | ansi_parser
+command: ! /usr/lib/nux/unity_support_test -p | ansi_parser | grep ":\(\s\+\)no"
 estimated_duration: 0.131
 _description: Check that hardware is able to run Unity 3D
 
 plugin: user-verify
-name: graphics/glxgears
+id: graphics/glxgears
 requires: package.name == 'mesa-utils'
 command: glxgears; true
 _description:
@@ -184,37 +200,37 @@ _description:
 2. Was the animation free from slowness/jerkiness?
 
 plugin: shell
-name: graphics/3d_window_open_close
+id: graphics/3d_window_open_close
 requires: package.name == 'mesa-utils'
 command: window_test -t open-close -i 10
 estimated_duration: 60.525
 _description: Open and close a 3D window multiple times
 
 plugin: shell
-name: graphics/3d_window_suspend_resume
+id: graphics/3d_window_suspend_resume
 requires: package.name == 'mesa-utils'
 command: window_test -t suspend-resume -i 10
 estimated_duration: 121.00
 _description: Open, suspend resume and close a 3D window multiple times
 
 plugin: shell
-name: graphics/multi_3d_windows_open_close
+id: graphics/multi_3d_windows_open_close
 requires: package.name == 'mesa-utils'
 command: window_test -t open-close-multi -i 10 -w 4
 estimated_duration: 60.000
 _description: Open and close 4 3D windows multiple times
 
 plugin: shell
-name: graphics/3d_window_move
+id: graphics/3d_window_move
 requires: package.name == 'mesa-utils'
 command: window_test -t move
 estimated_duration: 50.000
 _description: Move a 3D window around the screen
 
 plugin: shell
-name: graphics/screenshot
+id: graphics/screenshot
 requires: package.name == 'fswebcam'
-command: set -o pipefail; camera_test still --device=/dev/external_webcam -f ${CHECKBOX_DATA}/screenshot.jpg -q 2>&1 | ansi_parser
+command: set -o pipefail; camera_test still --device=/dev/external_webcam -f ${PLAINBOX_SESSION_SHARE}/screenshot.jpg -q 2>&1 | ansi_parser
 _description:
 PURPOSE:
 Take a screengrab of the current screen (logged on Unity desktop)
@@ -224,20 +240,20 @@ _description:
 Review attachment manually later
 
 plugin: attachment
-name: screenshot.jpg
+id: screenshot.jpg
 depends: graphics/screenshot
-command: base64 ${CHECKBOX_DATA}/screenshot.jpg
+command: base64 ${PLAINBOX_SESSION_SHARE}/screenshot.jpg
 _description: Attaches the screenshot captured in graphics/screenshot.
 
 plugin: shell
-name: graphics/screenshot_fullscreen_video
+id: graphics/screenshot_fullscreen_video
 requires: package.name == 'fswebcam'
 command:
- [ -f ${CHECKBOX_SHARE}/data/video/Ogg_Theora_Video.ogv ] || { echo "Video file not found"; exit 1; }
+ [ -f ${PLAINBOX_PROVIDER_DATA}/video/Ogg_Theora_Video.ogv ] || { echo "Video file not found"; exit 1; }
 dbus-launch gsettings set org.gnome.totem repeat true
- totem --fullscreen ${CHECKBOX_SHARE}/data/video/Ogg_Theora_Video.ogv 2>/dev/null &
+ totem --fullscreen ${PLAINBOX_PROVIDER_DATA}/video/Ogg_Theora_Video.ogv 2>/dev/null &
 set -o pipefail
- sleep 15 && camera_test still --device=/dev/external_webcam -f ${CHECKBOX_DATA}/screenshot_fullscreen_video.jpg -q 2>&1 | ansi_parser
+ sleep 15 && camera_test still --device=/dev/external_webcam -f ${PLAINBOX_SESSION_SHARE}/screenshot_fullscreen_video.jpg -q 2>&1 | ansi_parser
 sleep 5 && totem --quit 2>/dev/null
 dbus-launch gsettings set org.gnome.totem repeat false
 _description:
@@ -250,7 +266,26 @@ _description:
 Review attachment manually later
 
 plugin: attachment
-name: screenshot_fullscreen_video.jpg
+id: screenshot_fullscreen_video.jpg
 depends: graphics/screenshot_fullscreen_video
-command: base64 ${CHECKBOX_DATA}/screenshot_fullscreen_video.jpg
+command: base64 ${PLAINBOX_SESSION_SHARE}/screenshot_fullscreen_video.jpg
 _description: Attaches the screenshot captured in graphics/screenshot_fullscreen_video.
+
+plugin: shell
+id: graphics/screenshot_opencv_validation
+requires: package.name == 'python-opencv'
+environ: EXTERNAL_WEBCAM_DEVICE
+command:
+ screenshot_validation \
+ ${PLAINBOX_PROVIDER_DATA}/images/logo_Ubuntu_stacked_black.png \
+ --device=${EXTERNAL_WEBCAM_DEVICE:-/dev/external_webcam} \
+ -o ${PLAINBOX_SESSION_SHARE}/screenshot_opencv_validation.jpg
+_description:
+ Take a screengrab of the screen displaying a black and white Ubuntu logo.
+ Check that the screenshot matches the original file using OpenCV ORB detection.
+
+plugin: attachment
+id: screenshot_opencv_validation.jpg
+depends: graphics/screenshot_opencv_validation
+command: base64 ${PLAINBOX_SESSION_SHARE}/screenshot_opencv_validation.jpg
+_description: Attaches the screenshot captured in graphics/screenshot_opencv_validation.
diff --git a/provider_jobs/hibernate.txt.in b/jobs/hibernate.txt.in
index 9d7749e..14a60d7 100644
--- a/provider_jobs/hibernate.txt.in
+++ b/jobs/hibernate.txt.in
@@ -1,14 +1,14 @@
 plugin: user-interact-verify
-name: power-management/hibernate_advanced
+id: power-management/hibernate_advanced
 requires:
 sleep.disk == 'supported'
 rtc.state == 'supported'
-environ: CHECKBOX_DATA
+environ: PLAINBOX_SESSION_SHARE
 user: root
 command:
 if type -P fwts >/dev/null; then
 echo "Calling fwts"
- fwts_test -l $CHECKBOX_DATA/hibernate-single -f none -s s4 --s4-device-check --s4-device-check-delay=45 --s4-sleep-delay=120
+ fwts_test -l $PLAINBOX_SESSION_SHARE/hibernate-single -f none -s s4 --s4-device-check --s4-device-check-delay=45 --s4-sleep-delay=120
 else
 echo "Calling sleep_test"
 sleep_test -s disk -w 120
@@ -26,13 +26,13 @@ _description:
 Did the system successfully hibernate and did it work properly after waking up?
 
 plugin: shell
-name: power-management/hibernate-single-log-check
-command: [ -e $CHECKBOX_DATA/hibernate-single.log ] && sleep_test_log_check -v s4 $CHECKBOX_DATA/hibernate-single.log
+id: power-management/hibernate-single-log-check
+command: [ -e $PLAINBOX_SESSION_SHARE/hibernate-single.log ] && sleep_test_log_check -v s4 $PLAINBOX_SESSION_SHARE/hibernate-single.log
 _description:
 Automated check of the hibernate log for errors discovered by fwts
 
 plugin: attachment
-name: power-management/hibernate-single-log-attach
-command: [ -e $CHECKBOX_DATA/hibernate-single.log ] && cat $CHECKBOX_DATA/hibernate-single.log
+id: power-management/hibernate-single-log-attach
+command: [ -e $PLAINBOX_SESSION_SHARE/hibernate-single.log ] && cat $PLAINBOX_SESSION_SHARE/hibernate-single.log
 estimated_duration: 0.5
 description: attaches log from single hibernate/resume test to results
diff --git a/provider_jobs/info.txt.in b/jobs/info.txt.in
index 693a1c7..044946f 100644
--- a/provider_jobs/info.txt.in
+++ b/jobs/info.txt.in
@@ -1,29 +1,29 @@
-name: codecs_attachment
+id: codecs_attachment
 plugin: attachment
 requires: device.driver == 'snd_hda_intel'
 command: cat /proc/asound/card*/codec#*
 estimated_duration: 0.023
 _description: Attaches a report of installed codecs for Intel HDA
 
-name: cpuinfo_attachment
+id: cpuinfo_attachment
 plugin: attachment
 command: cat /proc/cpuinfo
 estimated_duration: 0.006
 _description: Attaches a report of CPU information
 
-name: dmesg_attachment
+id: dmesg_attachment
 plugin: attachment
 command: cat /var/log/dmesg | ansi_parser
 estimated_duration: 0.640
 _description: Attaches a copy of /var/log/dmesg to the test results
 
-name: dmi_attachment
+id: dmi_attachment
 plugin: attachment
-command: grep -r . /sys/class/dmi/id/ 2>/dev/null
+command: [ -d /sys/class/dmi/id/ ] && (grep -r . /sys/class/dmi/id/ 2>/dev/null || true) || false
 estimated_duration: 0.044
 _description: Attaches info on DMI
 
-name: dmidecode_attachment
+id: dmidecode_attachment
 plugin: attachment
 requires: package.name == 'dmidecode'
 user: root
@@ -31,33 +31,33 @@ command: dmidecode | iconv -t 'utf-8' -c
 estimated_duration: 0.030
 _description: Attaches dmidecode output
 
-name: lshw_attachment
+id: lshw_attachment
 plugin: attachment
 requires: package.name == 'lshw'
 user: root
 command: lshw | iconv -t 'utf-8' -c
 _description: Attaches lshw output
 
-name: efi_attachment
+id: efi_attachment
 plugin: attachment
 user: root
 command: [ -d /sys/firmware/efi ] && grep -m 1 -o --color=never 'EFI v.*' /var/log/kern.log* || true
 estimated_duration: 0.5
 _description: Attaches the firmware version
 
-name: lspci_attachment
+id: lspci_attachment
 plugin: attachment
 command: lspci -vvnn | iconv -t 'utf-8' -c
 estimated_duration: 0.042
 _description: Attaches very verbose lspci output.
 
-name: lspci_network_attachment
+id: lspci_network_attachment
 plugin: attachment
 command: lspci -vvnnQ | iconv -t 'utf-8' -c
 estimated_duration: 1.322
 _description: Attaches very verbose lspci output (with central database Query).
 
-name: lsusb_attachment
+id: lsusb_attachment
 plugin: attachment
 requires: package.name == 'usbutils'
 user: root
@@ -65,30 +65,30 @@ command: lsusb -vv | iconv -t 'utf-8' -c
 estimated_duration: 0.700
 _description: List USB devices
 
-name: meminfo_attachment
+id: meminfo_attachment
 plugin: attachment
 command: cat /proc/meminfo
 estimated_duration: 0.043
 
-name: modprobe_attachment
+id: modprobe_attachment
 plugin: attachment
 command: find /etc/modprobe.* -name \*.conf | xargs cat
 estimated_duration: 0.015
 _description: Attaches the contents of the various modprobe conf files.
 
-name: modules_attachment
+id: modules_attachment
 plugin: attachment
 command: cat /etc/modules
 estimated_duration: 0.004
 _description: Attaches the contents of the /etc/modules file.
 
-name: sysctl_attachment
+id: sysctl_attachment
 plugin: attachment
 command: find /etc/sysctl.* -name \*.conf | xargs cat
 estimated_duration: 0.014
 _description: attaches the contents of various sysctl config files.
 
-name: sysfs_attachment
+id: sysfs_attachment
 plugin: attachment
 _description: Attaches a report of sysfs attributes.
 command:
@@ -99,39 +99,39 @@ command:
 done
 estimated_duration: 6.344
 
-name: udev_attachment
+id: udev_attachment
 plugin: attachment
 command: udevadm info --export-db | xml_sanitize
 estimated_duration: 1.465
 _description: Attaches a dump of the udev database showing system hardware information.
 
-name: udev_resource_attachment
+id: udev_resource_attachment
 plugin: attachment
 command: udev_resource
 estimated_duration: 0.432
 _description: Attaches the output of udev_resource, for debugging purposes
 
-name: gcov_attachment
+id: gcov_attachment
 plugin: attachment
 requires: package.name == 'lcov'
 user: root
 command: gcov_tarball
 _description: Attaches a tarball of gcov data if present.
 
-name: lsmod_attachment
+id: lsmod_attachment
 plugin: attachment
 command: lsmod_info
 estimated_duration: 0.5
 _description: Attaches a list of the currently running kernel modules.
 
 plugin: attachment
-name: acpi_sleep_attachment
+id: acpi_sleep_attachment
 command: [ -e /proc/acpi/sleep ] && cat /proc/acpi/sleep
 estimated_duration: 0.5
 _description: Attaches the contents of /proc/acpi/sleep if it exists.
 
 plugin: shell
-name: info/bootchart
+id: info/bootchart
 _description: Bootchart information.
 requires: package.name == 'bootchart' or package.name == 'pybootchartgui'
 user: root
@@ -140,7 +140,7 @@ command:
 [ `ls /var/log/bootchart/*.tgz 2>/dev/null | wc -l` -lt 2 ] && reboot && sleep 100
 
 plugin: local
-name: info/hdparm
+id: info/hdparm
 _description: SATA/IDE device information.
 requires:
 package.name == 'hdparm'
@@ -148,7 +148,7 @@ requires:
 command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=DISK"'
 plugin: attachment
- name: info/hdparm_`ls /sys$path/block`.txt
+ id: info/hdparm_`ls /sys$path/block`.txt
 requires:
 device.path == "$path"
 block_device.`ls /sys$path/block`_state != 'removable'
@@ -157,7 +157,7 @@ command:
 EOF
 
 plugin: attachment
-name: bootchart.png
+id: bootchart.png
 depends: info/bootchart
 requires: package.name == 'pybootchartgui'
 _description: Attaches the bootchart png file for bootchart runs
@@ -166,7 +166,7 @@ command:
 [ -e "$file" ] && cat "$file"
 
 plugin: attachment
-name: bootchart.tgz
+id: bootchart.tgz
 depends: info/bootchart
 _description: Attaches the bootchart log for bootchart test runs.
 command:
@@ -174,18 +174,18 @@ command:
 [ -e "$file" ] && cat "$file"
 
 plugin: attachment
-name: installer_bootchart.tgz
+id: installer_bootchart.tgz
 command: [ -e /var/log/installer/bootchart.tgz ] && cat /var/log/installer/bootchart.tgz
 _description: installs the installer bootchart tarball if it exists.
 
 plugin: attachment
-name: installer_debug.gz
+id: installer_debug.gz
 command: [ -e /var/log/installer/debug ] && gzip -9 -c /var/log/installer/debug
 estimated_duration: 0.1
 _description: Attaches the installer debug log if it exists.
 
 plugin: attachment
-name: info/touchpad_driver
+id: info/touchpad_driver
 requires: device.category == 'TOUCHPAD'
 command: touchpad_driver_info
 estimated_duration: 0.384
@@ -194,7 +194,7 @@ _description:
 the system.
 
 plugin: attachment
-name: info/audio_device_driver
+id: info/audio_device_driver
 requires:
 package.name == 'pulseaudio-utils'
 package.name == 'module-init-tools'
@@ -204,7 +204,7 @@ estimated_duration: 0.177
 _description: Lists the device driver and version for all audio devices.
 
 plugin: attachment
-name: info/network_devices
+id: info/network_devices
 requires:
 device.category == 'NETWORK' or device.category == 'WIRELESS'
 package.name == 'module-init-tools'
@@ -214,12 +214,12 @@ estimated_duration: 0.550
 _description: Provides information about network devices
 
 plugin: attachment
-name: info/xrandr
+id: info/xrandr
 command: xrandr -q --verbose
 _description: Provides information about displays attached to the system
 
 plugin: attachment
-name: info/disk_partitions
+id: info/disk_partitions
 user: root
 command: parted -l
 _description: Attaches information about disk partitions
diff --git a/provider_jobs/input.txt.in b/jobs/input.txt.in
index b6972c2..e0f2fcb 100644
--- a/provider_jobs/input.txt.in
+++ b/jobs/input.txt.in
@@ -1,12 +1,12 @@
 plugin: local
-name: input/pointing
+id: input/pointing
 requires:
 device.category == 'MOUSE' or device.category == 'TOUCHPAD' or device.category == 'TOUCHSCREEN'
 _description: Pointing device tests.
 command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=MOUSE" -w "category=TOUCHPAD" -w "category=TOUCHSCREEN"'
 plugin: manual
- name: input/pointing_`echo "${product}_${category}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`_`basename $path`
+ id: input/pointing_`echo "${product}_${category}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`_`basename $path`
 requires: device.path == "$path"
 description:
 PURPOSE:
@@ -18,7 +18,7 @@ command:
 EOF
 
 plugin: manual
-name: input/mouse
+id: input/mouse
 _description:
 PURPOSE:
 This test will test your pointing device
@@ -29,7 +29,7 @@ _description:
 Did the pointing device work as expected?
 
 plugin: user-interact-verify
-name: input/keyboard
+id: input/keyboard
 command: keyboard_test
 requires: device.category == 'KEYBOARD'
 _description:
@@ -42,7 +42,7 @@ _description:
 Is your keyboard working properly?
 
 plugin: manual
-name: input/accelerometer_verify
+id: input/accelerometer_verify
 _description:
 PURPOSE:
 Manual detection of accelerometer.
@@ -52,7 +52,7 @@ _description:
 Is this system supposed to have an accelerometer?
 
 plugin: user-interact
-name: input/accelerometer
+id: input/accelerometer
 user: root
 depends: input/accelerometer_verify
 command: accelerometer_test -m
diff --git a/provider_jobs/install.txt.in b/jobs/install.txt.in
index 01fa0f8..62d86d5 100644
--- a/provider_jobs/install.txt.in
+++ b/jobs/install.txt.in
@@ -1,5 +1,5 @@
 plugin: shell
-name: install/apt-get-gets-updates
+id: install/apt-get-gets-updates
 requires: package.name == 'apt'
 user: root
 command: apt-get -d -y --force-yes dist-upgrade
diff --git a/provider_jobs/keys.txt.in b/jobs/keys.txt.in
index e8585c1..13c6a9b 100644
--- a/provider_jobs/keys.txt.in
+++ b/jobs/keys.txt.in
@@ -1,5 +1,5 @@
 plugin: user-interact
-name: keys/lock-screen
+id: keys/lock-screen
 requires:
 device.category == 'KEYBOARD'
 command: lock_screen_watcher
@@ -16,7 +16,7 @@ _description:
 automatically selected result.
 
 plugin: manual
-name: keys/brightness
+id: keys/brightness
 requires: dmi.product in ['Notebook','Laptop','Portable']
 _description:
 PURPOSE:
@@ -27,7 +27,7 @@ _description:
 Did the brightness change following to your key presses?
 
 plugin: user-interact-verify
-name: keys/volume
+id: keys/volume
 requires:
 device.category == 'KEYBOARD'
 user: root
@@ -43,7 +43,7 @@ _description:
 Do the keys work as expected?
 
 plugin: user-interact-verify
-name: keys/mute
+id: keys/mute
 requires:
 device.category == 'KEYBOARD'
 user: root
@@ -58,7 +58,7 @@ _description:
 Does the mute key work as expected?
 
 plugin: manual
-name: keys/sleep
+id: keys/sleep
 requires:
 device.category == 'KEYBOARD'
 depends: suspend/suspend_advanced
@@ -72,7 +72,7 @@ _description:
 Did the system go to sleep after pressing the sleep key?
 
 plugin: user-interact-verify
-name: keys/battery-info
+id: keys/battery-info
 requires: dmi.product in ['Notebook','Laptop','Portable']
 user: root
 command: key_test -s '0xe071,0xef1:Battery Info'
@@ -88,7 +88,7 @@ _description:
 Did the Battery Info key work as expected?
 
 plugin: manual
-name: keys/wireless
+id: keys/wireless
 requires: dmi.product in ['Notebook','Laptop','Portable']
 _description:
 PURPOSE:
@@ -106,7 +106,7 @@ _description:
 only consider the functionality of the wifi itself here.)
 
 plugin: user-interact
-name: keys/media-control
+id: keys/media-control
 requires:
 device.category == 'KEYBOARD'
 user: root
@@ -122,7 +122,7 @@ _description:
 Do the keys work as expected?
 
 plugin: user-interact
-name: keys/super
+id: keys/super
 requires:
 device.category == 'KEYBOARD'
 user: root
@@ -137,7 +137,7 @@ _description:
 Does the super key work as expected?
 
 plugin: manual
-name: keys/video-out
+id: keys/video-out
 requires: dmi.product in ['Notebook','Laptop','Portable']
 _description:
 PURPOSE:
@@ -149,7 +149,7 @@ _description:
 Check that the video signal can be mirrored, extended, displayed on external or onboard only.
 
 plugin: manual
-name: keys/touchpad
+id: keys/touchpad
 requires: dmi.product in ['Notebook','Laptop','Portable']
 _description:
 PURPOSE:
@@ -162,7 +162,7 @@ _description:
 Verify the touchpad has been disabled and re-enabled.
 
 plugin: manual
-name: keys/keyboard-backlight
+id: keys/keyboard-backlight
 requires: dmi.product in ['Notebook','Laptop','Portable']
 _description:
 PURPOSE:
@@ -176,14 +176,14 @@ _description:
 Did the keyboard backlight state change on each press?
 
 plugin: user-interact-verify
-name: keys/microphone-mute
+id: keys/microphone-mute
 requires:
 device.category == 'AUDIO'
 device.category == 'KEYBOARD'
 package.name == 'alsa-base'
 package.name == 'pulseaudio-utils'
 package.name == 'gstreamer1.0-plugins-good' or package.name == 'gstreamer0.10-plugins-good'
-command: audio_settings store --file=$CHECKBOX_DATA/pulseaudio_settings; audio_settings set --device=pci --volume=50; alsa_record_playback; EXIT_CODE=$?; audio_settings restore --file=$CHECKBOX_DATA/pulseaudio_settings; exit $EXIT_CODE
+command: audio_settings store --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; audio_settings set --device=pci --volume=50; alsa_record_playback; EXIT_CODE=$?; audio_settings restore --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; exit $EXIT_CODE
 _description:
 PURPOSE:
 This test will test the mute key for your microphone
@@ -195,7 +195,7 @@ _description:
 Does the microphone mute key work as expected?
 
 plugin: manual
-name: keys/hibernate
+id: keys/hibernate
 requires: dmi.product in ['Notebook','Laptop','Portable']
 depends: power-management/hibernate_advanced
 _description:
@@ -209,7 +209,7 @@ _description:
 Did the system go to hibernate after pressing the hibernate key?
 
 plugin: manual
-name: keys/keyboard-overhead-light
+id: keys/keyboard-overhead-light
 requires: dmi.product in ['Notebook','Laptop','Portable']
 _description:
 PURPOSE:
diff --git a/provider_jobs/led.txt.in b/jobs/led.txt.in
index 1fb0d84..5073460 100644
--- a/provider_jobs/led.txt.in
+++ b/jobs/led.txt.in
@@ -1,5 +1,5 @@
 plugin: manual
-name: led/power
+id: led/power
 _description:
 PURPOSE:
 Power LED verification
@@ -9,7 +9,7 @@ _description:
 Does the power LED light as expected?
 
 plugin: manual
-name: led/power-blink-suspend
+id: led/power-blink-suspend
 depends: suspend/suspend_advanced
 _description:
 PURPOSE:
@@ -20,7 +20,7 @@ _description:
 Did the Power LED blink or change color while the system was suspended for the previous suspend test?
 
 plugin: manual
-name: led/suspend
+id: led/suspend
 _description:
 PURPOSE:
 Suspend LED verification.
@@ -32,7 +32,7 @@ _description:
 Did the Suspend LED blink or change color while the system was suspended?
 
 plugin: manual
-name: led/battery-charging
+id: led/battery-charging
 _description:
 PURPOSE:
 Validate that the battery light shows charging status
@@ -43,7 +43,7 @@ _description:
 Did the battery indicator LED turn orange?
 
 plugin: manual
-name: led/battery-charged
+id: led/battery-charged
 _description:
 PURPOSE:
 Validate that the battery LED properly displays charged status
@@ -55,7 +55,7 @@ _description:
 Does the orange battery LED shut off when system is fully charged?
 
 plugin: manual
-name: led/battery-low
+id: led/battery-low
 _description:
 PURPOSE:
 Validate that the battery LED indicated low power
@@ -66,7 +66,7 @@ _description:
 Does the LED light orange when battery is low?
 
 plugin: user-interact-verify
-name: led/hdd
+id: led/hdd
 command: led_hdd_test
 _description:
 PURPOSE:
@@ -78,7 +78,7 @@ _description:
 Did the HDD LED light?
 
 plugin: user-interact-verify
-name: led/numeric-keypad
+id: led/numeric-keypad
 command: keyboard_test
 _description:
 PURPOSE:
@@ -92,7 +92,7 @@ _description:
 2. Numbers should only be entered in the keyboard verification window when the LED is on
 
 plugin: manual
-name: led/caps-lock
+id: led/caps-lock
 _description:
 PURPOSE:
 Block cap keys LED verification
@@ -103,7 +103,7 @@ _description:
 Did the Cap Keys LED light as expected?
 
 plugin: manual
-name: led/wlan
+id: led/wlan
 depends: keys/wireless
 _description:
 PURPOSE:
@@ -116,7 +116,7 @@ _description:
 Did the WLAN LED turn on or change color as expected?
 
 plugin: manual
-name: led/wlan-disabled
+id: led/wlan-disabled
 depends: keys/wireless
 _description:
 PURPOSE:
@@ -129,7 +129,7 @@ _description:
 Did the WLAN LED turn off or change color as expected?
 
 plugin: manual
-name: led/bluetooth
+id: led/bluetooth
 depends: bluetooth/detect-output
 _description:
 PURPOSE:
@@ -143,7 +143,7 @@ _description:
 Did the bluetooth LED turn off and on twice?
 
 plugin: user-interact-verify
-name: led/camera
+id: led/camera
 depends: camera/detect
 command: camera_test led
 _description:
@@ -156,7 +156,7 @@ _description:
 Did the camera LED light?
 
 plugin: manual
-name: led/touchpad
+id: led/touchpad
 _description:
 PURPOSE:
 Touchpad LED verification
@@ -169,7 +169,7 @@ _description:
 3. When the LED is off, the mouse pointer should not move on touchpad usage
 
 plugin: manual
-name: led/wireless
+id: led/wireless
 _description:
 PURPOSE:
 Wireless (WLAN + Bluetooth) LED verification
@@ -184,7 +184,7 @@ _description:
 Did the WLAN/Bluetooth LED light as expected?
 
 plugin: manual
-name: led/mute
+id: led/mute
 depends: keys/mute
 _description:
 PURPOSE:
diff --git a/jobs/local.txt.in b/jobs/local.txt.in
new file mode 100644
index 0000000..c767f16
--- /dev/null
+++ b/jobs/local.txt.in
@@ -0,0 +1,328 @@
+id: __audio__
+plugin: local
+_description: Audio tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/audio.txt?(.in)
+
+id: __benchmarks__
+plugin: local
+_description: Benchmarks tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/benchmarks.txt?(.in)
+
+id: __bluetooth__
+plugin: local
+_description: Bluetooth tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/bluetooth.txt?(.in)
+
+id: __camera__
+plugin: local
+_description: Camera tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/camera.txt?(.in)
+
+id: __codecs__
+plugin: local
+_description: Codec tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/codecs.txt?(.in)
+
+id: __cpu__
+plugin: local
+_description: CPU tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/cpu.txt?(.in)
+
+id: __daemons__
+plugin: local
+_description: System Daemon tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/daemons.txt?(.in)
+
+id: __disk__
+plugin: local
+_description: Disk tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/disk.txt?(.in)
+
+id: __ethernet__
+plugin: local
+_description: Ethernet Device tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/ethernet.txt?(.in)
+
+id: __esata__
+plugin: local
+_description: eSATA disk tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/esata.txt?(.in)
+
+id: __fingerprint__
+plugin: local
+_description: Fingerprint reader tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/fingerprint.txt?(.in)
+
+id: __firewire__
+plugin: local
+_description: Firewire disk tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/firewire.txt?(.in)
+
+id: __firmware__
+plugin: local
+_description: Firmware tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/firmware.txt?(.in)
+
+id: __floppy__
+plugin: local
+_description: Floppy disk tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/floppy.txt?(.in)
+
+id: __graphics__
+plugin: local
+_description: Graphics tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/graphics.txt?(.in)
+
+id: __hibernate__
+plugin: local
+_description: Hibernation tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/hibernate.txt?(.in)
+
+id: __info__
+plugin: local
+_description: Informational tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/info.txt?(.in)
+
+id: __input__
+plugin: local
+_description: Input Devices tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/input.txt?(.in)
+
+id: __install__
+plugin: local
+_description: Software Installation tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/install.txt?(.in)
+
+id: __keys__
+plugin: local
+_description: Hotkey tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/keys.txt?(.in)
+
+id: __led__
+plugin: local
+_description: LED tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/led.txt?(.in)
+
+id: __mediacard__
+plugin: local
+_description: Media Card tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/mediacard.txt?(.in)
+
+id: __memory__
+plugin: local
+_description: Memory tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/memory.txt?(.in)
+
+id: __rendercheck__
+plugin: local
+_description: Rendercheck tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/rendercheck.txt?(.in)
+
+id: __mir__
+plugin: local
+_description: MIR tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/mir.txt?(.in)
+
+id: __miscellanea__
+plugin: local
+_description: Miscellaneous tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/miscellanea.txt?(.in)
+
+id: __monitor__
+plugin: local
+_description: Monitor tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/monitor.txt?(.in)
+
+id: __networking__
+plugin: local
+_description: Non-device specific networking tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/networking.txt?(.in)
+
+id: __optical__
+plugin: local
+_description: Optical Drive tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/optical.txt?(.in)
+
+id: __panel_clock__
+plugin: local
+_description: Panel Clock Verification tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/panel_clock_test.txt?(.in)
+
+id: __panel_reboot__
+plugin: local
+_description: Panel Reboot Verification tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/panel_reboot.txt?(.in)
+
+id: __expresscard__
+plugin: local
+_description: ExpressCard tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/expresscard.txt?(.in)
+
+id: __peripheral__
+plugin: local
+_description: Peripheral tests
+command:
+ 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
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/power-management.txt?(.in)
+
+id: __server-services__
+plugin: local
+_description: Server Services checks
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/server-services.txt?(.in)
+
+id: __suspend__
+plugin: local
+_description: Suspend tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/suspend.txt?(.in)
+
+id: __touchpad__
+plugin: local
+_description: Touchpad tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/touchpad.txt?(.in)
+
+id: __touchscreen__
+plugin: local
+_description: Touchscreen tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/touchscreen.txt?(.in)
+
+id: __usb__
+plugin: local
+_description: USB tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/usb.txt?(.in)
+
+id: __user_apps__
+plugin: local
+_description: User Applications
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/user_apps.txt?(.in)
+
+id: __virtualization__
+plugin: local
+_description: Virtualization tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/virtualization.txt?(.in)
+
+id: __wireless__
+plugin: local
+_description: Wireless networking tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/wireless.txt?(.in)
+
+id: __mobilebroadband__
+plugin: local
+_description: Mobile broadband tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/mobilebroadband.txt?(.in)
+
+id: __stress__
+plugin: local
+_description: Stress tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/stress.txt?(.in)
+
+id: __smoke__
+plugin: local
+_description: Smoke tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/smoke.txt?(.in)
+
+id: __sniff__
+plugin: local
+_description: Sniff Sniffers
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/sniff.txt?(.in)
diff --git a/provider_jobs/mediacard.txt.in b/jobs/mediacard.txt.in
index dd7cc4c..262f1ff 100644
--- a/provider_jobs/mediacard.txt.in
+++ b/jobs/mediacard.txt.in
@@ -1,12 +1,13 @@
 plugin: user-interact
-name: mediacard/mmc-insert
+id: mediacard/mmc-insert
+estimated_duration: 30.0
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
 PURPOSE:
 This test will check that the systems media card reader can
 detect the insertion of a Multimedia Card (MMC) media
 STEPS:
- 1. Click "Test" and insert an MMC card into the reader.
+ 1. Click "Test" and then insert an MMC card into the reader.
 If a file browser opens up, you can safely close it.
 (Note: this test will time-out after 20 seconds.)
 2. Do not remove the device after this test.
@@ -15,7 +16,8 @@ _description:
 automatically selected result.
 
 plugin: shell
-name: mediacard/mmc-storage
+id: mediacard/mmc-storage
+estimated_duration: 30.0
 depends: mediacard/mmc-insert
 user: root
 command: removable_storage_test -s 67120000 --memorycard sdio usb scsi
@@ -24,7 +26,8 @@ _description:
 test is run. It tests reading and writing to the MMC card.
 
 plugin: user-interact
-name: mediacard/mmc-remove
+id: mediacard/mmc-remove
+estimated_duration: 30.0
 depends: mediacard/mmc-insert
 command: removable_storage_watcher --memorycard remove sdio usb scsi
 _description:
@@ -32,21 +35,22 @@ _description:
 This test will check that the system correctly detects 
 the removal of the MMC card from the systems card reader.
 STEPS:
- 1. Click "Test" and remove the MMC card from the reader.
+ 1. Click "Test" and then remove the MMC card from the reader.
 (Note: this test will time-out after 20 seconds.)
 VERIFICATION:
 The verification of this test is automated. Do not change the
 automatically selected result.
 
 plugin: user-interact
-name: mediacard/sd-insert
+id: mediacard/sd-insert
+estimated_duration: 30.0
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
 PURPOSE:
 This test will check that the systems media card reader can
 detect the insertion of an UNLOCKED Secure Digital (SD) media card
 STEPS:
- 1. Click "Test" and insert an UNLOCKED SD card into the reader.
+ 1. Click "Test" and then insert an UNLOCKED SD card into the reader.
 If a file browser opens up, you can safely close it.
 (Note: this test will time-out after 20 seconds.)
 2. Do not remove the device after this test.
@@ -55,7 +59,8 @@ _description:
 automatically selected result.
 
 plugin: shell
-name: mediacard/sd-storage
+id: mediacard/sd-storage
+estimated_duration: 30.0
 depends: mediacard/sd-insert
 user: root
 command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
@@ -64,7 +69,8 @@ _description:
 test is run. It tests reading and writing to the SD card.
 
 plugin: user-interact
-name: mediacard/sd-remove
+id: mediacard/sd-remove
+estimated_duration: 30.0
 depends: mediacard/sd-insert
 command: removable_storage_watcher --memorycard remove sdio usb scsi
 _description:
@@ -72,14 +78,15 @@ _description:
 This test will check that the system correctly detects 
 the removal of an SD card from the systems card reader.
 STEPS:
- 1. Click "Test" and remove the SD card from the reader.
+ 1. Click "Test" and then remove the SD card from the reader.
 (Note: this test will time-out after 20 seconds.)
 VERIFICATION:
 The verification of this test is automated. Do not change the
 automatically selected result.
 
 plugin: shell
-name: mediacard/sd-preinserted
+id: mediacard/sd-preinserted
+estimated_duration: 30.0
 user: root
 requires: device.category == 'CARDREADER'
 command: removable_storage_test -s 268400000 --memorycard -l sdio usb scsi && removable_storage_test --memorycard sdio usb scsi
@@ -89,7 +96,8 @@ _description:
 It is intended for SRU automated testing.
 
 plugin: user-interact
-name: mediacard/sdhc-insert
+id: mediacard/sdhc-insert
+estimated_duration: 30.0
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
 PURPOSE:
@@ -97,7 +105,7 @@ _description:
 detect the insertion of a UNLOCKED Secure Digital High-Capacity 
 (SDHC) media card
 STEPS:
- 1. Click "Test" and insert an UNLOCKED SDHC card into the reader.
+ 1. Click "Test" and then insert an UNLOCKED SDHC card into the reader.
 If a file browser opens up, you can safely close it.
 (Note: this test will time-out after 20 seconds.)
 2. Do not remove the device after this test.
@@ -106,7 +114,8 @@ _description:
 automatically selected result.
 
 plugin: shell
-name: mediacard/sdhc-storage
+id: mediacard/sdhc-storage
+estimated_duration: 30.0
 depends: mediacard/sdhc-insert
 user: root
 command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
@@ -115,7 +124,8 @@ _description:
 test is run. It tests reading and writing to the SDHC card.
 
 plugin: user-interact
-name: mediacard/sdhc-remove
+id: mediacard/sdhc-remove
+estimated_duration: 30.0
 depends: mediacard/sdhc-insert
 command: removable_storage_watcher --memorycard remove sdio usb scsi
 _description:
@@ -123,21 +133,22 @@ _description:
 This test will check that the system correctly detects 
 the removal of an SDHC card from the systems card reader.
 STEPS:
- 1. Click "Test" and remove the SDHC card from the reader.
+ 1. Click "Test" and then remove the SDHC card from the reader.
 (Note: this test will time-out after 20 seconds.)
 VERIFICATION:
 The verification of this test is automated. Do not change the
 automatically selected result.
 
 plugin: user-interact
-name: mediacard/cf-insert
+id: mediacard/cf-insert
+estimated_duration: 30.0
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
 PURPOSE:
 This test will check that the systems media card reader can
 detect the insertion of a Compact Flash (CF) media card
 STEPS:
- 1. Click "Test" and insert a CF card into the reader.
+ 1. Click "Test" and then insert a CF card into the reader.
 If a file browser opens up, you can safely close it.
 (Note: this test will time-out after 20 seconds.)
 2. Do not remove the device after this test.
@@ -146,7 +157,8 @@ _description:
 automatically selected result.
 
 plugin: shell
-name: mediacard/cf-storage
+id: mediacard/cf-storage
+estimated_duration: 30.0
 depends: mediacard/cf-insert
 user: root
 command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
@@ -155,29 +167,31 @@ _description:
 test is run. It tests reading and writing to the CF card.
 
 plugin: user-interact
-name: mediacard/cf-remove
+id: mediacard/cf-remove
 depends: mediacard/cf-storage
+estimated_duration: 30.0
 command: removable_storage_watcher --memorycard remove sdio usb scsi
 _description:
 PURPOSE:
 This test will check that the system correctly detects 
 the removal of a CF card from the systems card reader.
 STEPS:
- 1. Click "Test" and remove the CF card from the reader.
+ 1. Click "Test" and then remove the CF card from the reader.
 (Note: this test will time-out after 20 seconds.)
 VERIFICATION:
 The verification of this test is automated. Do not change the
 automatically selected result.
 
 plugin: user-interact
-name: mediacard/sdxc-insert
+id: mediacard/sdxc-insert
+estimated_duration: 30.0
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
 PURPOSE:
 This test will check that the systems media card reader can
 detect the insertion of a Secure Digital Extended Capacity (SDXC) media card
 STEPS:
- 1. Click "Test" and insert a SDXC card into the reader.
+ 1. Click "Test" and then insert an UNLOCKED SDXC card into the reader.
 If a file browser opens up, you can safely close it.
 (Note: this test will time-out after 20 seconds.)
 2. Do not remove the device after this test.
@@ -186,7 +200,8 @@ _description:
 automatically selected result.
 
 plugin: shell
-name: mediacard/sdxc-storage
+id: mediacard/sdxc-storage
+estimated_duration: 30.0
 depends: mediacard/sdxc-insert
 user: root
 command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
@@ -195,7 +210,8 @@ _description:
 test is run. It tests reading and writing to the SDXC card.
 
 plugin: user-interact
-name: mediacard/sdxc-remove
+id: mediacard/sdxc-remove
+estimated_duration: 30.0
 depends: mediacard/sdxc-insert
 command: removable_storage_watcher --memorycard remove sdio usb scsi
 _description:
@@ -203,21 +219,22 @@ _description:
 This test will check that the system correctly detects 
 the removal of a SDXC card from the systems card reader.
 STEPS:
- 1. Click "Test" and remove the SDXC card from the reader.
+ 1. Click "Test" and then remove the SDXC card from the reader.
 (Note: this test will time-out after 20 seconds.)
 VERIFICATION:
 The verification of this test is automated. Do not change the
 automatically selected result.
 
 plugin: user-interact
-name: mediacard/ms-insert
+id: mediacard/ms-insert
+estimated_duration: 30.0
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
 PURPOSE:
 This test will check that the systems media card reader can
 detect the insertion of a Memory Stick (MS) media card
 STEPS:
- 1. Click "Test" and insert a MS card into the reader.
+ 1. Click "Test" and then insert a MS card into the reader.
 If a file browser opens up, you can safely close it.
 (Note: this test will time-out after 20 seconds.)
 2. Do not remove the device after this test.
@@ -226,7 +243,8 @@ _description:
 automatically selected result.
 
 plugin: shell
-name: mediacard/ms-storage
+id: mediacard/ms-storage
+estimated_duration: 30.0
 depends: mediacard/ms-insert
 user: root
 command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
@@ -235,7 +253,8 @@ _description:
 test is run. It tests reading and writing to the MS card.
 
 plugin: user-interact
-name: mediacard/ms-remove
+id: mediacard/ms-remove
+estimated_duration: 30.0
 depends: mediacard/ms-insert
 command: removable_storage_watcher --memorycard remove sdio usb scsi
 _description:
@@ -243,21 +262,22 @@ _description:
 This test will check that the system correctly detects 
 the removal of a MS card from the systems card reader.
 STEPS:
- 1. Click "Test" and remove the MS card from the reader.
+ 1. Click "Test" and then remove the MS card from the reader.
 (Note: this test will time-out after 20 seconds.)
 VERIFICATION:
 The verification of this test is automated. Do not change the
 automatically selected result.
 
 plugin: user-interact
-name: mediacard/msp-insert
+id: mediacard/msp-insert
+estimated_duration: 30.0
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
 PURPOSE:
 This test will check that the systems media card reader can
 detect the insertion of a Memory Stick Pro (MSP) media card
 STEPS:
- 1. Click "Test" and insert a MSP card into the reader.
+ 1. Click "Test" and then insert a MSP card into the reader.
 If a file browser opens up, you can safely close it.
 (Note: this test will time-out after 20 seconds.)
 2. Do not remove the device after this test.
@@ -266,7 +286,8 @@ _description:
 automatically selected result.
 
 plugin: shell
-name: mediacard/msp-storage
+id: mediacard/msp-storage
+estimated_duration: 30.0
 depends: mediacard/msp-insert
 user: root
 command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
@@ -275,7 +296,8 @@ _description:
 test is run. It tests reading and writing to the MSP card.
 
 plugin: user-interact
-name: mediacard/msp-remove
+id: mediacard/msp-remove
+estimated_duration: 30.0
 depends: mediacard/msp-insert
 command: removable_storage_watcher --memorycard remove sdio usb scsi
 _description:
@@ -290,14 +312,15 @@ _description:
 automatically selected result.
 
 plugin: user-interact
-name: mediacard/xd-insert
+id: mediacard/xd-insert
+estimated_duration: 30.0
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
 PURPOSE:
 This test will check that the systems media card reader can
 detect the insertion of a Extreme Digital (xD) media card
 STEPS:
- 1. Click "Test" and insert a xD card into the reader.
+ 1. Click "Test" and then insert a xD card into the reader.
 If a file browser opens up, you can safely close it.
 (Note: this test will time-out after 20 seconds.)
 2. Do not remove the device after this test.
@@ -306,7 +329,8 @@ _description:
 automatically selected result.
 
 plugin: shell
-name: mediacard/xd-storage
+id: mediacard/xd-storage
+estimated_duration: 30.0
 depends: mediacard/xd-insert
 user: root
 command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
@@ -315,7 +339,8 @@ _description:
 test is run. It tests reading and writing to the xD card.
 
 plugin: user-interact
-name: mediacard/xd-remove
+id: mediacard/xd-remove
+estimated_duration: 30.0
 depends: mediacard/xd-insert
 command: removable_storage_watcher --memorycard remove sdio usb scsi
 _description:
@@ -323,8 +348,129 @@ _description:
 This test will check that the system correctly detects 
 the removal of a xD card from the systems card reader.
 STEPS:
- 1. Click "Test" and remove the xD card from the reader.
+ 1. Click "Test" and then remove the xD card from the reader.
 (Note: this test will time-out after 20 seconds.)
 VERIFICATION:
 The verification of this test is automated. Do not change the
 automatically selected result.
+
+plugin: user-interact-verify
+id: mediacard/sd-performance-manual
+depends: mediacard/sd-insert
+estimated_duration: 120.0
+user: root
+command: removable_storage_test -s 268400000 --memorycard sdio usb | cat <(echo "Working...") - <(echo; echo "Verify the result and click OK to decide on the outcome") | zenity --text-info --title 'SD Card Performance'
+_description:
+ PURPOSE:
+ This test will check your Media Card data transfer performance.
+ STEPS:
+ 1. Insert SD card into the reader slot on this computer.
+ 2. Click the test button to perform the test.
+ VERIFICATION:
+ Did the results of the test match the expected performance of the inserted device?
+
+plugin: user-interact-verify
+id: mediacard/sdhc-performance-manual
+depends: mediacard/sdhc-insert
+estimated_duration: 120.0
+user: root
+command: removable_storage_test -s 268400000 --memorycard sdio usb | cat <(echo "Working...") - <(echo; echo "Verify the result and click OK to decide on the outcome") | zenity --text-info --title 'SDHC Card Performance'
+_description:
+ PURPOSE:
+ This test will check your Media Card data transfer performance.
+ STEPS:
+ 1. Insert SDHC card into the reader slot on this computer.
+ 2. Click the test button to perform the test.
+ VERIFICATION:
+ Did the results of the test match the expected performance of the inserted device?
+
+plugin: user-interact-verify
+id: mediacard/mmc-performance-manual
+depends: mediacard/mmc-insert
+estimated_duration: 120.0
+user: root
+command: removable_storage_test -s 268400000 --memorycard sdio usb | cat <(echo "Working...") - <(echo; echo "Verify the result and click OK to decide on the outcome") | zenity --text-info --title 'MMC Card Performance'
+_description:
+ PURPOSE:
+ This test will check your Media Card data transfer performance.
+ STEPS:
+ 1. Insert MMC card into the reader slot on this computer.
+ 2. Click the test button to perform the test.
+ VERIFICATION:
+ Did the results of the test match the expected performance of the inserted device?
+
+plugin: user-interact-verify
+id: mediacard/cf-performance-manual
+depends: mediacard/cf-insert
+estimated_duration: 120.0
+user: root
+command: removable_storage_test -s 268400000 --memorycard sdio usb | cat <(echo "Working...") - <(echo; echo "Verify the result and click OK to decide on the outcome") | zenity --text-info --title 'CF Card Performance'
+_description:
+ PURPOSE:
+ This test will check your Media Card data transfer performance.
+ STEPS:
+ 1. Insert CF card into the reader slot on this computer.
+ 2. Click the test button to perform the test.
+ VERIFICATION:
+ Did the results of the test match the expected performance of the inserted device?
+
+plugin: user-interact-verify
+id: mediacard/sdxc-performance-manual
+depends: mediacard/sdxc-insert
+estimated_duration: 120.0
+user: root
+command: removable_storage_test -s 268400000 --memorycard sdio usb | cat <(echo "Working...") - <(echo; echo "Verify the result and click OK to decide on the outcome") | zenity --text-info --title 'SDXC Card Performance'
+_description:
+ PURPOSE:
+ This test will check your Media Card data transfer performance.
+ STEPS:
+ 1. Insert SDXC card into the reader slot on this computer.
+ 2. Click the test button to perform the test.
+ VERIFICATION:
+ Did the results of the test match the expected performance of the inserted device?
+
+plugin: user-interact-verify
+id: mediacard/ms-performance-manual
+depends: mediacard/ms-insert
+estimated_duration: 120.0
+user: root
+command: removable_storage_test -s 268400000 --memorycard sdio usb | cat <(echo "Working...") - <(echo; echo "Verify the result and click OK to decide on the outcome") | zenity --text-info --title 'MS Card Performance'
+_description:
+ PURPOSE:
+ This test will check your Media Card data transfer performance.
+ STEPS:
+ 1. Insert MS card into the reader slot on this computer.
+ 2. Click the test button to perform the test.
+ VERIFICATION:
+ Did the results of the test match the expected performance of the inserted device?
+
+plugin: user-interact-verify
+id: mediacard/msp-performance-manual
+depends: mediacard/msp-insert
+estimated_duration: 120.0
+user: root
+command: removable_storage_test -s 268400000 --memorycard sdio usb | cat <(echo "Working...") - <(echo; echo "Verify the result and click OK to decide on the outcome") | zenity --text-info --title 'MSP Card Performance'
+_description:
+ PURPOSE:
+ This test will check your Media Card data transfer performance.
+ STEPS:
+ 1. Insert MSP card into the reader slot on this computer.
+ 2. Click the test button to perform the test.
+ VERIFICATION:
+ Did the results of the test match the expected performance of the inserted device?
+
+plugin: user-interact-verify
+id: mediacard/xd-performance-manual
+depends: mediacard/xd-insert
+estimated_duration: 120.0
+user: root
+command: removable_storage_test -s 268400000 --memorycard sdio usb | cat <(echo "Working...") - <(echo; echo "Verify the result and click OK to decide on the outcome") | zenity --text-info --title 'XD Card Performance'
+_description:
+ PURPOSE:
+ This test will check your Media Card data transfer performance.
+ STEPS:
+ 1. Insert XD card into the reader slot on this computer.
+ 2. Click the test button to perform the test.
+ VERIFICATION:
+ Did the results of the test match the expected performance of the inserted device?
+
diff --git a/provider_jobs/memory.txt.in b/jobs/memory.txt.in
index 9cf4ebf..1678b9b 100644
--- a/provider_jobs/memory.txt.in
+++ b/jobs/memory.txt.in
@@ -1,5 +1,5 @@
 plugin: shell
-name: memory/info
+id: memory/info
 user: root
 command: memory_compare
 _description:
@@ -7,8 +7,10 @@ _description:
 the size of the memory modules detected by DMI.
 
 plugin: shell
-name: memory/check
+id: memory/check
 user: root
+requires:
+ uname.name == 'Linux'
 command: memory_test
 _description:
 Test and exercise memory.
diff --git a/jobs/mir.txt.in b/jobs/mir.txt.in
new file mode 100644
index 0000000..0482da5
--- /dev/null
+++ b/jobs/mir.txt.in
@@ -0,0 +1,27 @@
+plugin: local
+id: mir/integration
+requires: package.name == 'mir-test-tools'
+_description: MIR Integration tests
+command:
+ cat << 'EOF' | run_templates -s "mir_integration_tests --gtest_list_tests | sed -n '/\.$/s/\.$//p'"
+ estimated_duration: 0.5
+ plugin: shell
+ id: mir/integration/$1
+ requires: package.name == 'mir-test-tools'
+ command: mir_integration_tests --gtest_filter=$1*
+ _description: Run $1 test from MIR Integration tests.
+ EOF
+
+plugin: local
+id: mir/acceptance
+requires: package.name == 'mir-test-tools'
+_description: MIR Acceptance tests
+command:
+ cat << 'EOF' | run_templates -s "mir_acceptance_tests --gtest_list_tests | sed -n '/\.$/s/\.$//p'"
+ estimated_duration: 0.5
+ plugin: shell
+ id: mir/acceptance/$1
+ requires: package.name == 'mir-test-tools'
+ command: mir_acceptance_tests --gtest_filter=$1*
+ _description: Run $1 test from MIR Acceptance tests.
+ EOF
diff --git a/provider_jobs/miscellanea.txt.in b/jobs/miscellanea.txt.in
index 808d2c3..033796f 100644
--- a/provider_jobs/miscellanea.txt.in
+++ b/jobs/miscellanea.txt.in
@@ -1,13 +1,23 @@
 plugin: shell
-name: miscellanea/submission-resources
-depends: cpuinfo dpkg lsb package uname
+id: miscellanea/submission-resources
+depends:
+ cpuinfo
+ dmi
+ dpkg
+ lsb
+ package
+ requirements
+ uname
+ dmi_attachment
+ sysfs_attachment
+ udev_attachment
 estimated_duration: 1.0
 command: true
 _description:
 A meta-job depending on the resources needed for a valid submission.
 
 plugin: manual
-name: miscellanea/tester-info
+id: miscellanea/tester-info
 _description:
 PURPOSE:
 Keep tester related information in the report
@@ -21,7 +31,7 @@ _description:
 Nothing to verify for this test
 
 plugin: user-interact-verify
-name: miscellanea/chvt
+id: miscellanea/chvt
 requires:
 package.name == 'kbd'
 user: root
@@ -35,24 +45,25 @@ _description:
 Did your screen change temporarily to a text console and then switch back to your current session?
 
 plugin: shell
-name: miscellanea/fwts_test
+id: miscellanea/fwts_test
+estimated_duration: 1.2
 requires:
 package.name == 'fwts'
 user: root
 _description:
 Run Firmware Test Suite (fwts) automated tests.
-environ: CHECKBOX_DATA
+environ: PLAINBOX_SESSION_SHARE
 command:
- fwts_test -l $CHECKBOX_DATA/fwts_results.log
+ fwts_test -l $PLAINBOX_SESSION_SHARE/fwts_results.log
 
 plugin: attachment
-name: miscellanea/fwts_results.log
+id: miscellanea/fwts_results.log
 command:
- [[ -e ${CHECKBOX_DATA}/fwts_results.log ]] && cat ${CHECKBOX_DATA}/fwts_results.log
+ [[ -e ${PLAINBOX_SESSION_SHARE}/fwts_results.log ]] && cat ${PLAINBOX_SESSION_SHARE}/fwts_results.log
 _description: Attaches the FWTS results log to the submission
 
 plugin: shell
-name: miscellanea/ipmi_test
+id: miscellanea/ipmi_test
 requires: package.name == 'ipmitool'
 user: root
 command: ipmi_test
@@ -60,32 +71,32 @@ _description:
 This will run some basic connectivity tests against a BMC, verifying that IPMI works.
 
 plugin: shell
-name: miscellanea/is_laptop
+id: miscellanea/is_laptop
 user: root
 _description:
 Determine if we need to run tests specific to portable computers that may not apply to desktops.
 command: check_is_laptop
 
 plugin: shell
-name: miscellanea/apport-directory
+id: miscellanea/apport-directory
 requires: package.name == 'apport'
 command: if [ -d /var/crash ]; then if [ $(find /var/crash -type f | grep -v .lock | wc -l) -eq 0 ]; then echo "/var/crash is empty"; else echo `ls /var/crash`; false; fi; else echo "/var/crash does not exist"; fi
 _description:
 Test that the /var/crash directory doesn't contain anything. Lists the files contained within if it does, or echoes the status of the directory (doesn't exist/is empty)
 
 plugin: shell
-name: miscellanea/sources-list
+id: miscellanea/sources-list
 command: sources_test $SOURCES_LIST "$REPOSITORIES"
 _description: Checks that a specified sources list file contains the requested repositories
 
 plugin: local
-name: miscellanea/pxe_boot
+id: miscellanea/pxe_boot
 requires: device.category == 'NETWORK'
 _description: Automated job to generate the PXE verification test for each NIC.
 command:
 cat <<'EOF' | run_templates -s 'udev_resource | filter_templates -w "category=NETWORK" | awk "/path: / { print \$2 }" | xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do echo \$0 \$i; done"'
 plugin: manual
- name: miscellanea/pxe_boot_$2
+ id: miscellanea/pxe_boot_$2
 description:
 PURPOSE:
 This test will verify that you have attempted to PXE boot this machine from
@@ -99,13 +110,13 @@ command:
 EOF
 
 plugin: local
-name: miscellanea/remote_shared_ipmi
+id: miscellanea/remote_shared_ipmi
 requires: device.category == 'NETWORK'
 _description: Automated job to generate the Remote Shared IPMI verification test for each NIC.
 command:
 cat <<'EOF' | run_templates -s 'udev_resource | filter_templates -w "category=NETWORK" | awk "/path: / { print \$2 }" | xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do echo \$0 \$i; done"'
 plugin: manual
- name: miscellanea/remote_shared_ipmi_$2
+ id: miscellanea/remote_shared_ipmi_$2
 description:
 PURPOSE:
 This test will verify that you have attempted IPMI control of this machine from the network device $2.
@@ -118,7 +129,7 @@ command:
 EOF
 
 plugin: manual
-name: miscellanea/remote_dedicated_ipmi
+id: miscellanea/remote_dedicated_ipmi
 _description:
 PURPOSE:
 Some systems do not share IPMI over all NICs but instead have a dedicated management port directly connected to the BMC. This test verifies that you have used that port for remote IPMI connections and actions.
diff --git a/provider_jobs/mobilebroadband.txt.in b/jobs/mobilebroadband.txt.in
index e1f9a24..289625e 100644
--- a/provider_jobs/mobilebroadband.txt.in
+++ b/jobs/mobilebroadband.txt.in
@@ -1,5 +1,6 @@
 plugin: shell
-name: mobilebroadband/gsm_connection
+id: mobilebroadband/gsm_connection
+estimated_duration: 20.0
 requires:
 package.name == 'network-manager'
 package.name == 'modemmanager'
@@ -10,7 +11,8 @@ command: trap "nmcli con delete id $GSM_CONN_NAME" EXIT; create_connection mobil
 _description: Creates a mobile broadband connection for a GSM based modem and checks the connection to ensure it's working. 
 
 plugin: shell
-name: mobilebroadband/cdma_connection
+id: mobilebroadband/cdma_connection
+estimated_duration: 20.0
 requires:
 package.name == 'network-manager'
 package.name == 'modemmanager'
diff --git a/provider_jobs/monitor.txt.in b/jobs/monitor.txt.in
index 6db2740..3fe919c 100644
--- a/provider_jobs/monitor.txt.in
+++ b/jobs/monitor.txt.in
@@ -1,5 +1,5 @@
 plugin: manual
-name: monitor/vga
+id: monitor/vga
 requires: display.vga == 'supported'
 _description:
 PURPOSE:
@@ -11,7 +11,7 @@ _description:
 Was the desktop displayed correctly on both screens?
 
 plugin: manual
-name: monitor/dvi
+id: monitor/dvi
 requires: display.dvi == 'supported'
 _description:
 PURPOSE:
@@ -23,7 +23,7 @@ _description:
 Was the desktop displayed correctly on both screens?
 
 plugin: manual
-name: monitor/displayport
+id: monitor/displayport
 requires: display.dp == 'supported'
 _description:
 PURPOSE:
@@ -35,7 +35,7 @@ _description:
 Was the desktop displayed correctly on both screens?
 
 plugin: manual
-name: monitor/hdmi
+id: monitor/hdmi
 requires: display.hdmi == 'supported'
 _description:
 PURPOSE:
@@ -47,7 +47,7 @@ _description:
 Was the desktop displayed correctly on both screens?
 
 plugin: manual
-name: monitor/svideo
+id: monitor/svideo
 requires: display.svideo == 'supported'
 _description:
 PURPOSE:
@@ -59,7 +59,7 @@ _description:
 Was the desktop displayed correctly on both screens?
 
 plugin: manual
-name: monitor/rca
+id: monitor/rca
 requires: display.rca == 'supported'
 _description:
 PURPOSE:
@@ -71,7 +71,7 @@ _description:
 Was the desktop displayed correctly on both screens?
 
 plugin: manual
-name: monitor/multi-head
+id: monitor/multi-head
 requires: dmi.product in ['Desktop','Low Profile Desktop','Tower','Mini Tower']
 _description:
 PURPOSE:
@@ -86,7 +86,7 @@ _description:
 Was the stretched desktop displayed correctly across both screens?
 
 plugin: user-interact-verify
-name: monitor/powersaving
+id: monitor/powersaving
 command: xset dpms force off
 _description:
 PURPOSE:
@@ -98,7 +98,8 @@ _description:
 Did the monitor go blank and turn on again?
 
 plugin: user-interact-verify
-name: monitor/dim_brightness
+id: monitor/dim_brightness
+requires: dmi.product in ['Notebook','Laptop','Portable']
 user: root
 command: brightness_test
 _description:
diff --git a/provider_jobs/networking.txt.in b/jobs/networking.txt.in
index 43075ac..5b0bb3f 100644
--- a/provider_jobs/networking.txt.in
+++ b/jobs/networking.txt.in
@@ -1,18 +1,18 @@
 plugin: shell
-name: networking/gateway_ping
+id: networking/gateway_ping
 depends: ethernet/detect
 command: gateway_ping_test
 estimated_duration: 2.000
 _description: Tests whether the system has a working Internet connection.
 
 plugin: local
-name: networking/info
+id: networking/info
 requires: device.category == 'NETWORK'
 _description: Network Information
 command:
 cat <<'EOF' | run_templates -s 'udev_resource | filter_templates -w "category=NETWORK" | awk "/path: / { print \$2 }" | xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do echo \$0 \$i; done"'
 plugin: user-interact-verify
- name: networking/info_$2
+ id: networking/info_$2
 requires: device.path == "$1"
 command: network_info $2 | zenity --text-info --title="$2"
 _description:
@@ -25,7 +25,7 @@ command:
 EOF
 
 plugin: user-interact-verify
-name: networking/modem_connection
+id: networking/modem_connection
 command: network_check
 _description:
 PURPOSE:
@@ -42,32 +42,32 @@ _description:
 Did a notification show and was the connection correctly established?
 
 plugin: shell
-name: networking/ping
+id: networking/ping
 command: gateway_ping_test $CHECKBOX_SERVER
 _description:
 Automated test case to verify availability of some system on the network using ICMP ECHO packets.
 
 plugin: shell
-name: networking/http
+id: networking/http
 command: wget -SO /dev/null http://$TRANSFER_SERVER
 _description:
 Automated test case to make sure that it's possible to download files through HTTP
 
 plugin: shell
-name: networking/ntp
+id: networking/ntp
 requires: package.name == 'ntpdate'
 user: root
 command: network_ntp_test
 _description: Test to see if we can sync local clock to an NTP server
 
 plugin: shell
-name: networking/ssh
+id: networking/ssh
 requires: package.name == 'openssh-client'
 command: if [ $CHECKBOX_SERVER ]; then ssh -q -o 'StrictHostKeyChecking=no' -o "UserKnownHostsFile=/tmp/ssh_test_$$" -l ubuntu $CHECKBOX_SERVER "uname -a" && rm /tmp/ssh_test_$$; fi
 _description: Verify that an installation of checkbox-server on the network can be reached over SSH.
 
 plugin: shell
-name: networking/printer
+id: networking/printer
 requires: package.name == 'cups-client'
 command: network_printer_test -s $CHECKBOX_SERVER
 _description: Try to enable a remote printer on the network and print a test page.
diff --git a/provider_jobs/optical.txt.in b/jobs/optical.txt.in
index 66b59f5..819d9ee 100644
--- a/provider_jobs/optical.txt.in
+++ b/jobs/optical.txt.in
@@ -1,6 +1,7 @@
 plugin: shell
-name: optical/detect
+id: optical/detect
 requires: device.category == 'CDROM'
+estimated_duration: 1.2
 _description: Test to detect the optical drives
 command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=CDROM"' | sed '/^$/d'
@@ -8,15 +9,16 @@ command:
 EOF
 
 plugin: local
-name: optical/read
+id: optical/read
 requires:
 device.category == 'CDROM'
 _description: Optical read test.
 command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=CDROM"'
 plugin: user-interact-verify
- name: optical/read_`ls /sys$path/block`
+ id: optical/read_`ls /sys$path/block`
 requires: device.path == "$path"
+ estimated_duration: 120.0
 user: root
 command: optical_read_test /dev/`ls /sys$path/block`
 description:
@@ -31,14 +33,15 @@ command:
 EOF
 
 plugin: local
-name: optical/read-automated
+id: optical/read-automated
 requires:
 device.category == 'CDROM'
 _description: Automated optical read test.
 command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=CDROM"'
 plugin: shell
- name: optical/read-automated_`ls /sys$path/block`
+ id: optical/read-automated_`ls /sys$path/block`
+ estimated_duration: 120.0
 requires: device.path == "$path"
 user: root
 command: optical_read_test /dev/`ls /sys$path/block`
@@ -47,18 +50,20 @@ command:
 EOF
 
 plugin: local
-name: optical/cdrom-write
+id: optical/cdrom-write
 requires:
 device.category == 'CDROM'
- optical_drive.cd == 'writable'
 _description: CD write test.
 command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=CDROM"'
 plugin: user-interact-verify
- name: optical/cdrom-write_`ls /sys$path/block`
- requires: device.path == "$path"
+ id: optical/cdrom-write_`ls /sys$path/block`
+ estimated_duration: 120.0
+ requires: 
+ device.path == "$path"
+ optical_drive_`ls /sys$path/block`.cd_write == 'supported'
 user: root
- command: set -o pipefail; optical_write_test /dev/`ls /sys$path/block` | ansi_parser
+ command: set -o pipefail; optical_write_test /dev/`ls /sys$path/block` cd | ansi_parser
 description:
 PURPOSE:
 This test will check your system's $product CD writing capabilities. This test requires a blank CD-R or CD+R.
@@ -72,25 +77,28 @@ command:
 EOF
 
 plugin: local
-name: optical/cdrom-write-automated
+id: optical/cdrom-write-automated
 requires:
 device.category == 'CDROM'
- optical_drive.cd == 'writable'
 _description: Automated CD write test
 command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=CDROM"'
 plugin: shell
- name: optical/cdrom-write-automated_`ls /sys$path/block`
- requires: device.path == "$path"
+ id: optical/cdrom-write-automated_`ls /sys$path/block`
+ estimated_duration: 120.0
+ requires: 
+ device.path == "$path"
+ optical_drive_`ls /sys$path/block`.cd_write == 'supported'
 user: root
- command: set -o pipefail; optical_write_test /dev/`ls /sys$path/block` | ansi_parser
+ command: set -o pipefail; optical_write_test /dev/`ls /sys$path/block` cd | ansi_parser
 description:
 This is an automated version of optical/cdrom-write. It assumes you have already inserted a data CD into your optical drive prior to running Checkbox.
 EOF
 
 plugin: manual
-name: optical/cdrom-audio-playback
+id: optical/cdrom-audio-playback
 depends: optical/read
+estimated_duration: 120.0
 _description:
 PURPOSE:
 This test will check your CD audio playback capabilities
@@ -108,18 +116,20 @@ _description:
 Did all the steps work?
 
 plugin: local
-name: optical/dvd-write
+id: optical/dvd-write
 requires:
 device.category == 'CDROM'
- optical_drive.dvd == 'writable'
 _description: DVD write test.
 command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=CDROM"'
 plugin: user-interact-verify
- name: optical/dvd-write_`ls /sys$path/block`
- requires: device.path == "$path"
+ id: optical/dvd-write_`ls /sys$path/block`
+ requires: 
+ device.path == "$path"
+ optical_drive_`ls /sys$path/block`.dvd_write == 'supported'
+ estimated_duration: 120.0
 user: root
- command: set -o pipefail; optical_write_test /dev/`ls /sys$path/block` | ansi_parser
+ command: set -o pipefail; optical_write_test /dev/`ls /sys$path/block` dvd | ansi_parser
 description:
 PURPOSE:
 This test will check your system's $product writing capabilities. This test requires a blank DVD-R or DVD+R.
@@ -133,25 +143,28 @@ command:
 EOF
 
 plugin: local
-name: optical/dvd-write-automated
+id: optical/dvd-write-automated
 requires:
 device.category == 'CDROM'
- optical_drive.dvd == 'writable'
 _description: Automated DVD write test.
 command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=CDROM"'
 plugin: shell
- name: optical/dvd-write-automated_`ls /sys$path/block`
- requires: device.path == "$path"
+ id: optical/dvd-write-automated_`ls /sys$path/block`
+ estimated_duration: 120.0
+ requires: 
+ device.path == "$path"
+ optical_drive_`ls /sys$path/block`.dvd_write == 'supported'
 user: root
- command: set -o pipefail; optical_write_test /dev/`ls /sys$path/block` | ansi_parser
+ command: set -o pipefail; optical_write_test /dev/`ls /sys$path/block` dvd | ansi_parser
 description:
 This is an automated version of optical/dvd-write. It assumes you have already inserted a data DVD into your optical drive prior to running Checkbox.
 EOF
 
 plugin: user-interact-verify
-name: optical/dvd_playback
+id: optical/dvd_playback
 command: totem /media/cdrom
+estimated_duration: 120.0
 requires:
 device.category == 'CDROM'
 package.name == 'totem'
@@ -163,3 +176,55 @@ _description:
 2. Click "Test" to play the DVD in Totem
 VERIFICATION:
 Did the file play?
+
+plugin: local
+id: optical/bluray-read
+requires: device.category == 'CDROM'
+_description: Automated Blu-Ray read test.
+command:
+ cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=CDROM"'
+ plugin: user-interact
+ id: optical/bluray-read_`ls /sys$path/block`
+ estimated_duration: 120.0
+ requires:
+ device.path == "$path"
+ optical_drive_`ls /sys$path/block`.bd_read == "supported"
+ user: root
+ command: optical_read_test /dev/`ls /sys$path/block`
+ estimated_duration: 10.00
+ description:
+ PURPOSE:
+ This test will check your $product device's ability to read Blu-Ray (BD) media
+ STEPS:
+ 1. Insert appropriate non-blank media into your Blu-Ray drive. Movie and Audio Disks may not work. Self-created data disks have the greatest chance of working.
+ 2. If a file browser window opens, you can safely close or ignore that window.
+ 3. Click "Test" to begin the test.
+ VERIFICATION:
+ This test should automatically select "Yes" if it passes, "No" if it fails.
+ EOF
+
+plugin: local
+id: optical/bluray-write
+requires: device.category == 'CDROM'
+_description: Automated Blu-Ray write test.
+command:
+ cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=CDROM"'
+ plugin: user-interact
+ id: optical/bluray-write_`ls /sys$path/block`
+ requires:
+ device.path == "$path"
+ optical_drive_`ls /sys$path/block`.bd_write == "supported"
+ package.name == "growisofs"
+ user: root
+ command: set -o pipefail; optical_write_test /dev/`ls /sys$path/block` bd | ansi_parser
+ estimated_duration: 120.00
+ description:
+ PURPOSE:
+ This test will check your $product device's ability to write Blu-Ray (BD) media
+ STEPS:
+ Skip this test if you do not have a blank BD-R disc
+ 1. Insert appropriate writable media into your Blu-Ray drive.
+ 2. Click "Test" to begin the test.
+ VERIFICATION:
+ This test should automatically select "Yes" if it passes, "No" if it fails.
+ EOF
diff --git a/provider_jobs/panel_clock_test.txt.in b/jobs/panel_clock_test.txt.in
index 2b41da8..22f14fb 100644
--- a/provider_jobs/panel_clock_test.txt.in
+++ b/jobs/panel_clock_test.txt.in
@@ -1,4 +1,4 @@
-name: panel_clock/verify
+id: panel_clock/verify
 plugin: manual
 requires: package.name == 'gnome-system-tools'
 _description:
@@ -9,7 +9,7 @@ _description:
 VERIFICATION:
 Is the clock displaying the correct date and time for your timezone?
 
-name: panel_clock/test
+id: panel_clock/test
 plugin: user-interact-verify
 depends: panel_clock/verify
 requires: package.name == 'gnome-system-tools'
diff --git a/provider_jobs/panel_reboot.txt.in b/jobs/panel_reboot.txt.in
index 8dada11..f4e6290 100644
--- a/provider_jobs/panel_reboot.txt.in
+++ b/jobs/panel_reboot.txt.in
@@ -1,5 +1,5 @@
 plugin: manual
-name: panel_reboot_test
+id: panel_reboot_test
 _description:
 PURPOSE:
 This test will verify that you can reboot your system from the desktop menu
diff --git a/provider_jobs/peripheral.txt.in b/jobs/peripheral.txt.in
index 6f7bbe1..17b8d32 100644
--- a/provider_jobs/peripheral.txt.in
+++ b/jobs/peripheral.txt.in
@@ -1,5 +1,5 @@
 plugin: manual
-name: peripheral/printer
+id: peripheral/printer
 _description:
 PURPOSE:
 This test will verify that a network printer is usable
@@ -13,7 +13,7 @@ _description:
 Were you able to print a test page to the network printer?
 
 plugin: user-interact-verify
-name: peripheral/external-usb-modem
+id: peripheral/external-usb-modem
 command: network_check
 _description:
 PURPOSE:
@@ -31,7 +31,7 @@ _description:
 Was the connection correctly established?
 
 plugin: shell
-name: peripheral/external-usb-modem-http
+id: peripheral/external-usb-modem-http
 depends: peripheral/external-usb-modem
 command: wget -SO /dev/null http://$TRANSFER_SERVER
 _description:
diff --git a/provider_jobs/piglit.txt.in b/jobs/piglit.txt.in
index 5f5bfd9..4508122 100644
--- a/provider_jobs/piglit.txt.in
+++ b/jobs/piglit.txt.in
@@ -1,5 +1,5 @@
 plugin: shell
-name: piglit/fbo
+id: piglit/fbo
 requires:
 package.name == 'piglit'
 command: piglit_test -t ^spec/EXT_framebuffer_object -n fbo
@@ -8,7 +8,7 @@ _description:
 Runs piglit tests for checking support for framebuffer object operations, depth buffer and stencil buffer
 
 plugin: shell
-name: piglit/gl-2.1
+id: piglit/gl-2.1
 requires:
 package.name == 'piglit'
 command: piglit_test -t spec/'!OpenGL 2.1'/ -n gl-2.1
@@ -17,7 +17,7 @@ _description:
 Runs piglit tests for checking OpenGL 2.1 support
 
 plugin: shell
-name: piglit/vbo
+id: piglit/vbo
 requires:
 package.name == 'piglit'
 command: piglit_test -t spec/ARB_vertex_buffer_object/ -n vbo
@@ -26,7 +26,7 @@ _description:
 Runs piglit tests for checking support for vertex buffer object operations
 
 plugin: shell
-name: piglit/glsl-fragment-shader
+id: piglit/glsl-fragment-shader
 requires:
 package.name == 'piglit'
 command: piglit_test -t ^shaders/glsl-arb-fragment -n glsl-fragment-shader
@@ -35,7 +35,7 @@ _description:
 Runs piglit tests for checking support for GLSL fragment shader operations
 
 plugin: shell
-name: piglit/glsl-vertex-shader
+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
@@ -44,7 +44,7 @@ _description:
 Runs piglit tests for checking support for GLSL vertex shader operations
 
 plugin: shell
-name: piglit/glx-tfp
+id: piglit/glx-tfp
 requires:
 package.name == 'piglit'
 command: piglit_test -t glx-tfp -n glx-tfp
@@ -53,7 +53,7 @@ _description:
 Runs piglit tests for checking support for texture from pixmap
 
 plugin: shell
-name: piglit/stencil_buffer
+id: piglit/stencil_buffer
 requires:
 package.name == 'piglit'
 command: piglit_test -t glx-visuals-stencil -t readpixels-24_8 -n stencil_buffer
@@ -62,19 +62,19 @@ _description:
 Runs piglit_tests for checking support for stencil buffer operations
 
 plugin: shell
-name: piglit/summarize_results
+id: piglit/summarize_results
 requires:
 package.name == 'piglit'
-command: [ -e $CHECKBOX_DATA/piglit-results ] && piglit-summary-html.py $CHECKBOX_DATA/piglit-summary/ `find $CHECKBOX_DATA/piglit-results/ -name main` && echo "Successfully summarized piglit results. They are available in $CHECKBOX_DATA/piglit-sumary/"
+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
-name: piglit/tarball
+id: piglit/tarball
 requires:
 package.name == 'piglit'
 depends: piglit/summarize_results
-command: [ -e $CHECKBOX_DATA/piglit-summary ] && tar cvfz $CHECKBOX_DATA/piglit-results.tar.gz $CHECKBOX_DATA/piglit-summary/
+command: [ -e $PLAINBOX_SESSION_SHARE/piglit-summary ] && tar cvfz $PLAINBOX_SESSION_SHARE/piglit-results.tar.gz $PLAINBOX_SESSION_SHARE/piglit-summary/
 _description:
 Archives the piglit-summary directory into the piglit-results.tar.gz.
diff --git a/provider_jobs/power-management.txt.in b/jobs/power-management.txt.in
index 6672ea8..7639907 100644
--- a/provider_jobs/power-management.txt.in
+++ b/jobs/power-management.txt.in
@@ -1,5 +1,5 @@
 plugin: manual
-name: power-management/shutdown-boot
+id: power-management/shutdown-boot
 _description:
 PURPOSE:
 This test will check your system shutdown/booting cycle.
@@ -11,31 +11,31 @@ _description:
 Did the system shutdown and rebooted correctly?
 
 plugin: shell
-name: power-management/fwts_wakealarm
-environ: CHECKBOX_DATA
+id: power-management/fwts_wakealarm
+environ: PLAINBOX_SESSION_SHARE
 user: root
 _description: Test ACPI Wakealarm (fwts wakealarm)
 requires:
 package.name == 'fwts'
-command: fwts_test -f aborted -t wakealarm -l $CHECKBOX_DATA/fwts-wakealarm.log
+command: fwts_test -f aborted -t wakealarm -l $PLAINBOX_SESSION_SHARE/fwts-wakealarm.log
 
 plugin: attachment
-name: power-management/fwts_wakealarm-log-attach
+id: power-management/fwts_wakealarm-log-attach
 depends: power-management/fwts_wakealarm
 _description: Attach log from fwts wakealarm test
 requires:
 package.name == 'fwts'
-command: [ -e ${CHECKBOX_DATA}/fwts-wakealarm.log ] && cat ${CHECKBOX_DATA}/fwts-wakealarm.log
+command: [ -e ${PLAINBOX_SESSION_SHARE}/fwts-wakealarm.log ] && cat ${PLAINBOX_SESSION_SHARE}/fwts-wakealarm.log
 
 plugin: user-interact-verify
-name: power-management/poweroff
+id: power-management/poweroff
 depends: power-management/fwts_wakealarm
 user: root
-environ: CHECKBOX_DATA
+environ: PLAINBOX_SESSION_SHARE
 requires:
 package.name == 'upstart'
 package.name == 'fwts'
-command: pm_test poweroff --log-level=debug --log-dir=$CHECKBOX_DATA
+command: pm_test poweroff --log-level=debug --log-dir=$PLAINBOX_SESSION_SHARE
 _description:
 PURPOSE:
 This test will check the system's ability to power-off and boot.
@@ -50,19 +50,19 @@ _description:
 select 'No'.
 
 plugin: attachment
-name: power-management/poweroff-log-attach
-command: tar cvfz power-management_poweroff.tgz $CHECKBOX_DATA/*poweroff.1.log && cat $CHECKBOX_DATA/power-management_poweroff.tgz
+id: power-management/poweroff-log-attach
+command: tar cvfz power-management_poweroff.tgz $PLAINBOX_SESSION_SHARE/*poweroff.1.log && cat $PLAINBOX_SESSION_SHARE/power-management_poweroff.tgz
 _description:
 This will attach any logs from the power-management/poweroff test to the results.
 
 plugin: user-interact-verify
-name: power-management/reboot
+id: power-management/reboot
 user: root
-environ: CHECKBOX_DATA
+environ: PLAINBOX_SESSION_SHARE
 requires:
 package.name == 'upstart'
 package.name == 'fwts'
-command: pm_test reboot --log-level=debug --log-dir=$CHECKBOX_DATA
+command: pm_test reboot --log-level=debug --log-dir=$PLAINBOX_SESSION_SHARE
 _description:
 PURPOSE:
 This test will check the system's ability to reboot cleanly.
@@ -75,13 +75,14 @@ _description:
 If the machine successfully reboots, select Yes then select Next.
 
 plugin: attachment
-name: power-management/reboot-log-attach
-command: tar cvfz power-management_reboot.tgz $CHECKBOX_DATA/*reboot.1.log && cat $CHECKBOX_DATA/power-management_reboot.tgz
+id: power-management/reboot-log-attach
+command: tar cvfz power-management_reboot.tgz $PLAINBOX_SESSION_SHARE/*reboot.1.log && cat $PLAINBOX_SESSION_SHARE/power-management_reboot.tgz
 _description:
 This will attach any logs from the power-management/reboot test to the results.
 
 plugin: manual
-name: power-management/lid
+id: power-management/lid
+requires: dmi.product in ['Notebook','Laptop','Portable']
 _description:
 PURPOSE:
 This test will check your lid sensors.
@@ -91,7 +92,7 @@ _description:
 Does closing your laptop lid cause your system to suspend?
 
 plugin: user-interact
-name: power-management/lid_close
+id: power-management/lid_close
 requires: device.product == 'Lid Switch'
 command:
 for i in `seq 20`; do
@@ -109,7 +110,7 @@ _description:
 Did the screen turn off while the lid was closed?
 
 plugin: user-interact
-name: power-management/lid_open
+id: power-management/lid_open
 requires: device.product == 'Lid Switch'
 command:
 for i in `seq 20`; do
@@ -129,7 +130,7 @@ _description:
 Did the system resume when the lid was opened?
 
 plugin: shell
-name: power-management/rtc
+id: power-management/rtc
 requires:
 rtc.state == 'supported'
 package.name == 'util-linux'
@@ -140,13 +141,13 @@ _description:
 Verify that the Real-time clock (RTC) device functions properly, if present
 
 plugin: shell
-name: power-management/tickless_idle
+id: power-management/tickless_idle
 _description: Check to see if CONFIG_NO_HZ is set in the kernel (this is just a simple regression check)
 command:
 zgrep 'CONFIG_NO_HZ=y' /boot/config-`uname -r` >/dev/null 2>&1 || ( echo "WARNING: Tickless Idle is NOT set" >&2 && exit 1 )
 
 plugin: manual
-name: power-management/unplug_ac
+id: power-management/unplug_ac
 _description:
 PURPOSE:
 This test will ensure that the AC is unplugged for the battery drain tests to run.
@@ -156,7 +157,7 @@ _description:
 Was the laptop unplugged from AC?
 
 plugin: shell
-name: power-management/battery_drain_idle
+id: power-management/battery_drain_idle
 requires: package.name == 'upower'
 depends: power-management/unplug_ac
 _description: Checks the battery drain during idle. Reports time until empty
@@ -165,7 +166,7 @@ command:
 battery_test -t 90 --idle
 
 plugin: shell
-name: power-management/battery_drain_movie
+id: power-management/battery_drain_movie
 requires:
 package.name == 'upower'
 depends: power-management/unplug_ac
@@ -175,7 +176,7 @@ command:
 battery_test -t 90 --movie $MOVIE_VAR
 
 plugin: shell
-name: power-management/battery_drain_sleep
+id: power-management/battery_drain_sleep
 user: root
 requires:
 package.name == 'upower'
@@ -187,7 +188,7 @@ command:
 battery_test -t 120 --sleep
 
 plugin: manual
-name: power-management/plug_ac
+id: power-management/plug_ac
 depends: power-management/battery_drain_idle power-management/battery_drain_movie power-management/battery_drain_sleep
 _description:
 PURPOSE:
@@ -199,7 +200,7 @@ _description:
 Was the laptop plugged into AC?
 
 plugin: user-interact-verify
-name: power-management/reboot_manual
+id: power-management/reboot_manual
 user:root
 command: shutdown -r now
 _description:
@@ -217,7 +218,7 @@ _description:
 Did the system reboot correctly?
 
 plugin: user-interact-verify
-name: power-management/shutdown_manual
+id: power-management/shutdown_manual
 user: root
 command: shutdown -h now
 _description:
diff --git a/jobs/rendercheck.txt.in b/jobs/rendercheck.txt.in
new file mode 100644
index 0000000..54dd32e
--- /dev/null
+++ b/jobs/rendercheck.txt.in
@@ -0,0 +1,13 @@
+plugin: shell
+id: rendercheck/tests
+requires:
+ package.name == 'x11-apps'
+command: ( rendercheck_test -b repeat -b gradients -d -o $PLAINBOX_SESSION_SHARE/rendercheck-results && echo "Rendercheck tests completed successfully" ) || ( echo "Error running rendercheck. Please see the log $PLAINBOX_SESSION_SHARE/rendercheck-results for details" >&2 && false )
+_description:
+ Runs all of the rendercheck test suites. This test can take a few minutes.
+
+plugin: attachment
+id: rendercheck/tarball
+depends: rendercheck/tests
+command: [ -e $PLAINBOX_SESSION_SHARE/rendercheck-results ] && tar cvfz $PLAINBOX_SESSION_SHARE/rendercheck-results.tar.gz $PLAINBOX_SESSION_SHARE/rendercheck-results && cat $PLAINBOX_SESSION_SHARE/rendercheck-results.tar.gz
+_description: Attach log from rendercheck tests
diff --git a/provider_jobs/server-services.txt.in b/jobs/server-services.txt.in
index f667557..e151dea 100644
--- a/provider_jobs/server-services.txt.in
+++ b/jobs/server-services.txt.in
@@ -1,17 +1,17 @@
 plugin: shell
-name: services/open_ssh_test
+id: services/open_ssh_test
 requires: package.name == 'ssh'
 command: pgrep sshd >/dev/null || (echo 'FAIL: sshd is not running.' 2>&1 && false)
 _description: Verifies that sshd is running.
 
 plugin: shell
-name: services/print_server_test
+id: services/print_server_test
 requires: package.name == 'cups'
 command: pgrep cupsd >/dev/null || (echo 'FAIL: cupsd is not running.' 2>&1 && false)
 _description: Verifies that Print/CUPs server is running.
 
 plugin: shell
-name: services/dns_server_test
+id: services/dns_server_test
 requires:
 package.name == 'bind9'
 package.name == 'dnsutils'
@@ -20,7 +20,7 @@ command: dns_server_test
 _description: Verifies that DNS server is running and working.
 
 plugin: shell
-name: services/samba_test
+id: services/samba_test
 requires:
 package.name == 'samba'
 package.name == 'winbind'
@@ -29,7 +29,7 @@ command: samba_test
 _description: Verifies that Samba server is running.
 
 plugin: shell
-name: services/lamp_test
+id: services/lamp_test
 requires:
 package.name == 'apache2'
 package.name == 'php5-mysql'
@@ -40,7 +40,7 @@ command: lamp_test
 _description: Verifies that the LAMP stack is running (Apache, MySQL and PHP).
 
 plugin: shell
-name: services/tomcat_test
+id: services/tomcat_test
 requires: package.name == 'tomcat6'
 user: root
 command: tomcat_test
diff --git a/provider_jobs/smoke.txt.in b/jobs/smoke.txt.in
index cf9298e..4b69314 100644
--- a/provider_jobs/smoke.txt.in
+++ b/jobs/smoke.txt.in
@@ -1,45 +1,45 @@
 plugin: shell
-name: smoke/true
+id: smoke/true
 command: true
 _description:
 Check success result from shell test case
 
 plugin: shell
-name: smoke/false
+id: smoke/false
 command: false
 _description:
 Check failed result from shell test case
 
 plugin: shell
-name: smoke/dependency/good
+id: smoke/dependency/good
 depends: smoke/true
 command: true
 _description:
 Check job is executed when dependency succeeds
 
 plugin: shell
-name: smoke/dependency/bad
+id: smoke/dependency/bad
 depends: smoke/false
 command: true
 _description:
 Check job result is set to uninitiated when dependency fails
 
 plugin: shell
-name: smoke/requirement/good
+id: smoke/requirement/good
 requires: package.name == "checkbox"
 command: true
 _description:
 Check job is executed when requirements are met
 
 plugin: shell
-name: smoke/requirement/bad
+id: smoke/requirement/bad
 requires: package.name == "unknown-package"
 command: true
 _description:
 Check job result is set to "not required on this system" when requirements are not met
 
 plugin: manual
-name: smoke/manual
+id: smoke/manual
 _description:
 PURPOSE:
 This test checks that the manual plugin works fine
diff --git a/provider_jobs/sniff.txt.in b/jobs/sniff.txt.in
index 7908627..1fe149b 100644
--- a/provider_jobs/sniff.txt.in
+++ b/jobs/sniff.txt.in
@@ -1,5 +1,5 @@
 plugin: user-interact
-name: sniff/sniff7
+id: sniff/sniff7
 command: true
 _description:
 PURPOSE:
@@ -10,7 +10,7 @@ _description:
 None Necessary, this is a bogus test
 
 plugin: manual
-name: sniff/sniff6
+id: sniff/sniff6
 _description:
 PURPOSE:
 To sniff things out
@@ -20,7 +20,7 @@ _description:
 None Necessary, this is a bogus test
 
 plugin: manual
-name: sniff/sniff5
+id: sniff/sniff5
 _description:
 PURPOSE:
 To sniff things out
@@ -30,7 +30,7 @@ _description:
 None Necessary, this is a bogus test
 
 plugin: user-interact
-name: sniff/sniff4
+id: sniff/sniff4
 command: reboot
 user: root
 _description:
@@ -43,7 +43,7 @@ _description:
 You won't see the user-verify
 
 plugin: manual
-name: sniff/sniff3
+id: sniff/sniff3
 _description:
 PURPOSE:
 If Recovery is successful, you will see this test on restarting checkbox, not
@@ -54,7 +54,7 @@ _description:
 None Necessary, this is a bogus test
 
 plugin: manual
-name: sniff/sniff2
+id: sniff/sniff2
 _description:
 PURPOSE:
 To sniff things out
@@ -64,7 +64,7 @@ _description:
 None Necessary, this is a bogus test
 
 plugin: manual
-name: sniff/sniff1
+id: sniff/sniff1
 _description:
 PURPOSE:
 To sniff things out
diff --git a/jobs/stress.txt.in b/jobs/stress.txt.in
new file mode 100644
index 0000000..5e47714
--- /dev/null
+++ b/jobs/stress.txt.in
@@ -0,0 +1,257 @@
+plugin: shell
+id: stress/cpu_stress_test
+requires:
+ package.name == 'stress'
+user: root
+command: num_vm=$(awk '/MemTotal/ {x=$2/262144; print ((x == int(x)) ? x : int(x) +1)}' /proc/meminfo); vm_bytes=$(($(awk '/MemTotal/ {print int($2/1024)}' /proc/meminfo)/$num_vm/4))M; stress --cpu `cpuinfo_resource | awk '/count:/ {print $2}'` --vm $num_vm --vm-bytes $vm_bytes --timeout 7200s
+_description:
+ PURPOSE:
+ Create jobs that use the CPU as much as possible for two hours. The test is considered passed if the system does not freeze.
+
+plugin: shell
+id: power-management/hibernate_30_cycles
+depends:
+ power-management/hibernate_advanced
+requires:
+ sleep.disk == 'supported'
+ rtc.state == 'supported'
+environ: PLAINBOX_SESSION_SHARE
+user: root
+command:
+ if type -P fwts >/dev/null; then
+ echo "Calling fwts"
+ fwts_test -l $PLAINBOX_SESSION_SHARE/hibernate_30_cycles -f none -s s4 --s4-device-check --s4-device-check-delay=45 --s4-sleep-delay=120 --s4-multiple=30
+ else
+ echo "Calling sleep_test"
+ set -o pipefail; sleep_test -s disk -i 30 -w 120 | tee $PLAINBOX_SESSION_SHARE/hibernate_30_cycles.log
+ fi
+_description:
+ PURPOSE:
+ This is an automated stress test that will force the system to hibernate/resume for 30 cycles
+
+plugin: shell
+id: power-management/hibernate-30-cycles-log-check
+command: [ -e $PLAINBOX_SESSION_SHARE/hibernate_30_cycles.log ] && sleep_test_log_check -v s4 $PLAINBOX_SESSION_SHARE/hibernate_30_cycles.log
+_description:
+ Automated check of the 30 cycle hibernate log for errors detected by fwts.
+
+plugin: attachment
+id: power-management/hibernate-30-cycle-log-attach
+command: [ -e $PLAINBOX_SESSION_SHARE/hibernate_30_cycles.log ] && cat $PLAINBOX_SESSION_SHARE/hibernate_30_cycles.log
+_description:
+ Attaches the log from the 30 cycle Hibernate/Resume test if it exists
+
+plugin: shell
+id: power-management/suspend_30_cycles
+depends:
+ power-management/rtc
+ suspend/suspend_advanced
+environ: PLAINBOX_SESSION_SHARE
+user: root
+command:
+ if type -P fwts >/dev/null; then
+ echo "Calling fwts"
+ set -o pipefail; fwts_test -l $PLAINBOX_SESSION_SHARE/suspend_30_cycles -f none -s s3 --s3-device-check --s3-device-check-delay=45 --s3-sleep-delay=30 --s3-multiple=30 | tee $PLAINBOX_SESSION_SHARE/suspend_30_cycles_times.log
+ else
+ echo "Calling sleep_test"
+ set -o pipefail; sleep_test -p -s mem -i 30 | tee $PLAINBOX_SESSION_SHARE/suspend_30_cycles.log
+ fi
+_description:
+ PURPOSE:
+ This is an automated stress test that will force the system to suspend/resume for 30 cycles.
+
+plugin: shell
+id: power-management/suspend-30-cycles-log-check
+depends: power-management/suspend_30_cycles
+command: [ -e $PLAINBOX_SESSION_SHARE/suspend_30_cycles.log ] && sleep_test_log_check -v s3 $PLAINBOX_SESSION_SHARE/suspend_30_cycles.log
+_description:
+ Automated check of the 30 cycle hibernate log for errors detected by fwts.
+
+plugin: attachment
+id: power-management/suspend-30-cycle-log-attach
+depends: power-management/suspend_30_cycles
+command: [ -e $PLAINBOX_SESSION_SHARE/suspend_30_cycles.log ] && cat $PLAINBOX_SESSION_SHARE/suspend_30_cycles.log
+_description:
+ Attaches the log from the 30 cycle Suspend/Resume test if it exists
+
+plugin: shell
+id: power-management/suspend-30-cycles-time-check
+depends: power-management/suspend_30_cycles
+command: [ -e $PLAINBOX_SESSION_SHARE/suspend_30_cycles_times.log ] && sleep_time_check $PLAINBOX_SESSION_SHARE/suspend_30_cycles_times.log
+_description:
+ Checks the sleep times to ensure that a machine suspends and resumes within a given threshold
+
+plugin: shell
+id: stress/hibernate_250_cycles
+depends: power-management/rtc
+environ: PLAINBOX_SESSION_SHARE
+user: root
+command:
+ if type -P fwts >/dev/null; then
+ echo "Calling fwts"
+ fwts_test -l $PLAINBOX_SESSION_SHARE/hibernate_250_cycles -s s4 --s4-device-check --s4-device-check-delay=45 --s4-sleep-delay=120 --s4-multiple=250
+ else
+ echo "Calling sleep_test"
+ set -o pipefail; sleep_test -s disk -i 250 -w 120 | tee $PLAINBOX_SESSION_SHARE/hibernate_250_cycles.log
+ fi
+_description:
+ PURPOSE:
+ This is an automated stress test that will force the system to hibernate/resume for 250 cycles
+
+plugin: attachment
+id: stress/hibernate-250-cycle-log-attach
+command: [ -e $PLAINBOX_SESSION_SHARE/hibernate_250_cycles.log ] && cat $PLAINBOX_SESSION_SHARE/hibernate_250_cycles.log
+_description:
+ Attaches the log from the 250 cycle Hibernate/Resume test if it exists
+
+plugin: shell
+id: stress/suspend_250_cycles
+depends: power-management/rtc
+environ: PLAINBOX_SESSION_SHARE
+user: root
+command:
+ if type -P fwts >/dev/null; then
+ echo "Calling fwts"
+ set -o pipefail; fwts_test -l $PLAINBOX_SESSION_SHARE/suspend_250_cycles -s s3 --s3-device-check --s3-device-check-delay=45 --s3-sleep-delay=30 --s3-multiple=250 | tee $PLAINBOX_SESSION_SHARE/suspend_250_cycles_times.log
+ else
+ echo "Calling sleep_test"
+ set -o pipefail; sleep_test -p -s mem -i 250 | tee $PLAINBOX_SESSION_SHARE/suspend_250_cycles.log
+ fi
+_description:
+ PURPOSE:
+ This is an automated stress test that will force the system to suspend/resume for 250 cycles.
+
+plugin: attachment
+id: stress/suspend-250-cycle-log-attach
+command: [ -e $PLAINBOX_SESSION_SHARE/suspend_250_cycles.log ] && cat $PLAINBOX_SESSION_SHARE/suspend_250_cycles.log
+_description:
+ Attaches the log from the 250 cycle Suspend/Resume test if it exists
+
+plugin: shell
+id: stress/suspend-250-cycles-time-check
+command: [ -e $PLAINBOX_SESSION_SHARE/suspend_250_cycles_times.log ] && sleep_time_check $PLAINBOX_SESSION_SHARE/suspend_250_cycles_times.log
+_description:
+ Checks the sleep times to ensure that a machine suspends and resumes within a given threshold
+
+plugin: shell
+id: stress/reboot
+requires:
+ package.name == 'upstart'
+ package.name == 'fwts'
+command: pm_test -r 100 --silent --log-level=notset reboot --log-dir=$PLAINBOX_SESSION_SHARE
+user: root
+environ: PLAINBOX_SESSION_SHARE
+_description:
+ Stress reboot system (100 cycles)
+
+plugin: attachment
+id: stress/reboot_log
+depends: stress/reboot
+command: tar cvfz $PLAINBOX_SESSION_SHARE/stress_reboot.tgz $PLAINBOX_SESSION_SHARE/*reboot.100.log && cat $PLAINBOX_SESSION_SHARE/stress_reboot.tgz
+
+plugin: shell
+id: stress/poweroff
+requires:
+ package.name == 'upstart'
+ package.name == 'fwts'
+command: pm_test -r 100 --silent --log-level=notset poweroff --log-dir=$PLAINBOX_SESSION_SHARE
+user: root
+environ: PLAINBOX_SESSION_SHARE
+_description:
+ Stress poweroff system (100 cycles)
+
+plugin: attachment
+id: stress/poweroff_log
+depends: stress/poweroff
+command: tar cvfz $PLAINBOX_SESSION_SHARE/stress_poweroff.tgz $PLAINBOX_SESSION_SHARE/*poweroff.100.log && cat $PLAINBOX_SESSION_SHARE/stress_poweroff.tgz
+
+plugin: shell
+id: stress/reboot_check
+depends: stress/reboot
+command: pm_log_check --log-level=notset $PLAINBOX_SESSION_SHARE/pm_test.reboot.100.log $PLAINBOX_SESSION_SHARE/pm_log_check_reboot.100.log
+_description: Check logs for the stress reboot (100 cycles) test case
+
+plugin: attachment
+id: stress/reboot_check_log
+depends: stress/reboot_check
+command:
+ tar cvfz $PLAINBOX_SESSION_SHARE/stress_reboot_check.tgz $PLAINBOX_SESSION_SHARE/pm_log_check_reboot.100.log && cat $PLAINBOX_SESSION_SHARE/stress_reboot_check.tgz
+
+plugin: shell
+id: stress/poweroff_check
+depends: stress/poweroff
+command: pm_log_check --log-level=notset $PLAINBOX_SESSION_SHARE/pm_test.poweroff.100.log $PLAINBOX_SESSION_SHARE/pm_log_check_poweroff.100.log
+_description: Check logs for the stress poweroff (100 cycles) test case
+
+plugin: attachment
+id: stress/poweroff_check_log
+depends: stress/poweroff_check
+command:
+ tar cvfz $PLAINBOX_SESSION_SHARE/stress_poweroff_check.tgz $PLAINBOX_SESSION_SHARE/pm_log_check_poweroff.100.log && cat $PLAINBOX_SESSION_SHARE/stress_poweroff_check.tgz
+
+plugin: shell
+id: stress/graphics
+requires:
+ package.name == 'x11-apps'
+user: root
+environ: PLAINBOX_SESSION_SHARE
+command: graphics_stress_test -b repeat -d -o $PLAINBOX_SESSION_SHARE/graphics-stress-results && echo "Graphics Stress Test completed successfully" || echo "Graphics Stress Test completed, but there are errors. Please see the log $PLAINBOX_SESSION_SHARE/graphics-stress-results for details" && false
+_description:
+ Run the graphics stress test. This test can take a few minutes.
+
+plugin: shell
+id: stress/graphics-tarball
+requires:
+ package.name == 'x11-apps'
+depends: stress/graphics
+command: [ -e $PLAINBOX_SESSION_SHARE/graphics-stress-results ] && tar cvfz $PLAINBOX_SESSION_SHARE/graphics-stress-results.tar.gz $PLAINBOX_SESSION_SHARE/graphics-stress-results
+_description: Attaches the graphics stress results to the submission.
+
+plugin: shell
+id: stress/usb
+user: root
+command: removable_storage_test -s 10240000 -c 100 -i 3 usb
+_description: Runs a test that transfers 100 10MB files 3 times to usb.
+
+plugin: user-interact
+id: stress/sdhc
+user: root
+_summary: Stress test for SDHC card
+estimated_duration: 780.0
+command: removable_storage_test -s 10240000 -c 100 -i 3 sdio scsi usb --memorycard
+_description:
+ PURPOSE:
+ This test will transfers 100 10MB files 3 times to a SDHC card, to
+ check that the systems media card reader can transfer large amounts
+ of data.
+ STEPS:
+ 1. Insert a SDHC card into the reader and then Click "Test".
+ If a file browser opens up, you can safely close it.
+ 2. Do not remove the device during this test.
+ VERIFICATION:
+ The verification of this test is automated. Do not change the
+ automatically selected result.
+
+plugin: shell
+id: stress/network_restart
+user: root
+environ: PLAINBOX_SESSION_SHARE
+command: network_restart -t 1 -o $PLAINBOX_SESSION_SHARE
+_description: Ping ubuntu.com and restart network interfaces 100 times
+
+plugin: attachment
+id: stress/network_restart_log
+depends: stress/network_restart
+command: file=$PLAINBOX_SESSION_SHARE/network_restart.log; if [ -e "$file" ]; then iconv -t 'ascii' -c "$file"; fi
+
+plugin: manual
+id: stress/wireless_hotkey
+requires: dmi.product in ['Notebook','Laptop','Portable']
+_description:
+ PURPOSE:
+ To make sure that stressing the wifi hotkey does not cause applets to disappear from the panel or the system to lock up
+ STEPS:
+ 1. Log in to desktop
+ 2. Press wifi hotkey at a rate of 1 press per second and slowly increase the speed of the tap, until you are tapping as fast as possible
+ VERIFICATION:
+ Verify the system is not frozen and the wifi and bluetooth applets are still visible and functional
diff --git a/provider_jobs/suspend.txt.in b/jobs/suspend.txt.in
index 6524c2a..7f0ab8a 100644
--- a/provider_jobs/suspend.txt.in
+++ b/jobs/suspend.txt.in
@@ -1,53 +1,58 @@
 plugin: shell
-name: suspend/network_before_suspend
+id: suspend/network_before_suspend
 depends: ethernet/detect
+estimated_duration: 1.2
 _description: Record the current network before suspending.
-command: set -o pipefail; gateway_ping_test | tee $CHECKBOX_DATA/network_before_suspend.txt
+command: set -o pipefail; gateway_ping_test | tee $PLAINBOX_SESSION_SHARE/network_before_suspend.txt
 
 plugin: shell
-name: suspend/resolution_before_suspend
+id: suspend/resolution_before_suspend
+estimated_duration: 1.2
 _description: Record the current resolution before suspending.
-command: xrandr -q |grep '*'| awk '{print $1}' > $CHECKBOX_DATA/resolution_before_suspend.txt
+command: xrandr -q |grep '*'| awk '{print $1}' > $PLAINBOX_SESSION_SHARE/resolution_before_suspend.txt
 
 plugin: shell
-name: suspend/audio_before_suspend
+id: suspend/audio_before_suspend
 estimated_duration: 1.0
 requires:
 device.category == 'AUDIO'
 package.name == 'alsa-base'
 _description: Record mixer settings before suspending.
-command: audio_settings store --file=$CHECKBOX_DATA/audio_settings_before_suspend
+command: audio_settings store --file=$PLAINBOX_SESSION_SHARE/audio_settings_before_suspend
 
 plugin: shell
-name: suspend/cpu_before_suspend
+id: suspend/cpu_before_suspend
+estimated_duration: 1.2
 _description: Verify that all the CPUs are online before suspending
-command: cpuinfo_resource > $CHECKBOX_DATA/cpuinfo_before_suspend
+command: cpuinfo_resource > $PLAINBOX_SESSION_SHARE/cpuinfo_before_suspend
 
 plugin: shell
-name: suspend/memory_before_suspend
+id: suspend/memory_before_suspend
+estimated_duration: 1.2
 _description:
 Dumps memory info to a file for comparison after suspend test has been run
-command: meminfo_resource > $CHECKBOX_DATA/meminfo_before_suspend
+command: meminfo_resource > $PLAINBOX_SESSION_SHARE/meminfo_before_suspend
 
 plugin: shell
-name: suspend/wireless_before_suspend
+id: suspend/wireless_before_suspend
 depends: wireless/wireless_connection
 requires: device.category == 'WIRELESS'
-command: nmcli -t -f UUID con status > $CHECKBOX_DATA/connections && connect_wireless && gateway_ping_test --interface=`nmcli dev list | grep -B 1 wireless | grep GENERAL.DEVICE | awk '{print $2}'` && for con in `cat $CHECKBOX_DATA/connections`; do nmcli con up uuid "$con"; done
+command: nmcli -t -f UUID con status > $PLAINBOX_SESSION_SHARE/connections && connect_wireless && gateway_ping_test --interface=`nmcli dev list | grep -B 1 wireless | grep GENERAL.DEVICE | awk '{print $2}'` && for con in `cat $PLAINBOX_SESSION_SHARE/connections`; do nmcli con up uuid "$con"; done
 estimated_duration: 20.0
 _description:
 This test disconnects all connections and then connects to the wireless
 interface. It then checks the connection to confirm it's working as expected.
 
 plugin: local
-name: suspend/iperf_before_suspend_ether_auto
+id: suspend/iperf_before_suspend_ether_auto
 requires:
 device.category == 'NETWORK'
 command: 
 cat <<'EOF' | run_templates -s 'udev_resource | filter_templates -w "category=NETWORK" | awk "/path: / { print \$2 }" | xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do echo \$0 \$i; done"'
 plugin: shell
- name: suspend/iperf_before_suspend_ether_auto_$2
+ id: suspend/iperf_before_suspend_ether_auto_$2
 depends: ethernet/detect
+ estimated_duration: 20.0
 requires: device.path == "$1"
 user: root
 command: network -i $2 -t iperf
@@ -58,14 +63,15 @@ _description:
 This is an automated test to gather some info on the current state of your network devices. If no devices are found, the test will exit with an error.
 
 plugin: local
-name: suspend/iperf_before_suspend_wifi_auto
+id: suspend/iperf_before_suspend_wifi_auto
 requires:
 device.category == 'WIRELESS'
 command: 
 cat <<'EOF' | run_templates -s 'udev_resource | filter_templates -w "category=WIRELESS" | awk "/path: / { print \$2 }" | xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do echo \$0 \$i; done"'
 plugin: shell
- name: suspend/iperf_before_suspend_wifi_auto_$2
+ id: suspend/iperf_before_suspend_wifi_auto_$2
 depends: wireless/wireless_connection
+ estimated_duration: 20.0
 requires: device.path == "$1"
 user: root
 command: network -i $2 -t iperf
@@ -76,7 +82,8 @@ _description:
 This is an automated test to gather some info on the current state of your network devices. If no devices are found, the test will exit with an error.
 
 plugin: shell
-name: suspend/bluetooth_obex_before_suspend
+id: suspend/bluetooth_obex_before_suspend
+estimated_duration: 10.0
 requires:
 package.name == 'bluez'
 package.name == 'obexd-client'
@@ -97,12 +104,13 @@ command:
 rfkill unblock bluetooth
 sleep 3
 fi
- obex_send $BTDEVADDR $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg
+ obex_send $BTDEVADDR $PLAINBOX_PROVIDER_DATA/images/JPEG_Color_Image_Ubuntu.jpg
 _description:
 This is an automated Bluetooth file transfer test. It sends an image to the device specified by the BTDEVADDR environment variable.
 
 plugin: shell
-name: suspend/bluetooth_obex_send_before_suspend
+id: suspend/bluetooth_obex_send_before_suspend
+estimated_duration: 10.0
 requires:
 package.name == 'bluez'
 package.name == 'obexftp'
@@ -123,12 +131,13 @@ command:
 rfkill unblock bluetooth
 sleep 3
 fi
- set -o pipefail; bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR send 2>&1 | ansi_parser
+ set -o pipefail; bluetooth_test $PLAINBOX_PROVIDER_DATA/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR send 2>&1 | ansi_parser
 _description:
 This is an automated Bluetooth file transfer test. It sends an image to the device specified by the BTDEVADDR environment variable.
 
 plugin: shell
-name: suspend/bluetooth_obex_browse_before_suspend
+id: suspend/bluetooth_obex_browse_before_suspend
+estimated_duration: 10.0
 requires:
 package.name == 'bluez'
 package.name == 'obexftp'
@@ -149,12 +158,13 @@ command:
 rfkill unblock bluetooth
 sleep 3
 fi
- set -o pipefail; bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR browse 2>&1 | ansi_parser
+ set -o pipefail; bluetooth_test $PLAINBOX_PROVIDER_DATA/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR browse 2>&1 | ansi_parser
 _description:
 This is an automated Bluetooth test. It emulates browsing on a remote device specified by the BTDEVADDR environment variable.
 
 plugin: shell
-name: suspend/bluetooth_obex_get_before_suspend
+id: suspend/bluetooth_obex_get_before_suspend
+estimated_duration: 20.0
 requires:
 package.name == 'bluez'
 package.name == 'obexftp'
@@ -175,17 +185,18 @@ command:
 rfkill unblock bluetooth
 sleep 3
 fi
- set -o pipefail; bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR get 2>&1 | ansi_parser
+ set -o pipefail; bluetooth_test $PLAINBOX_PROVIDER_DATA/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR get 2>&1 | ansi_parser
 _description:
 This is an automated Bluetooth test. It receives the given file from a remote host specified by the BTDEVADDR environment variable
 
 plugin: user-interact-verify
-name: suspend/bluetooth_obex_before_suspend_manual
+id: suspend/bluetooth_obex_before_suspend_manual
+estimated_duration: 120.0
 requires:
 package.name == 'bluez'
 package.name == 'obexd-client'
 device.category == 'BLUETOOTH'
-command: rfkill unblock bluetooth; obex_send `bluetooth_scan` $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg
+command: rfkill unblock bluetooth; obex_send `bluetooth_scan` $PLAINBOX_PROVIDER_DATA/images/JPEG_Color_Image_Ubuntu.jpg
 _description:
 PURPOSE:
 This test will send the image 'JPEG_Color_Image_Ubuntu.jpg' to a specified device
@@ -197,19 +208,19 @@ _description:
 Was the data correctly transferred?
 
 plugin: user-verify
-name: suspend/suspend_advanced
+id: suspend/suspend_advanced
 requires:
 sleep.mem == 'supported'
 rtc.state == 'supported'
 user: root
-environ: CHECKBOX_DATA
+environ: PLAINBOX_SESSION_SHARE
 command:
 if type -P fwts >/dev/null; then
 echo "Calling fwts"
- set -o pipefail; fwts_test -f none -l $CHECKBOX_DATA/suspend_single -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee $CHECKBOX_DATA/suspend_single_times.log
+ set -o pipefail; fwts_test -f none -l $PLAINBOX_SESSION_SHARE/suspend_single -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee $PLAINBOX_SESSION_SHARE/suspend_single_times.log
 else
 echo "Calling sleep_test"
- set -o pipefail; sleep_test -p | tee $CHECKBOX_DATA/suspend_single_times.log
+ set -o pipefail; sleep_test -p | tee $PLAINBOX_SESSION_SHARE/suspend_single_times.log
 fi
 estimated_duration: 90.0
 _description:
@@ -225,39 +236,42 @@ _description:
 (NOTE: Please only consider whether the system successfully suspended and resumed. Power/Suspend LED verification will occur after this test is completed.)
 
 plugin: shell
-name: suspend/suspend_advanced_auto
+id: suspend/suspend_advanced_auto
 requires:
 sleep.mem == 'supported'
 rtc.state == 'supported'
 _description:
 This is the automated version of suspend/suspend_advanced.
 user: root
-environ: CHECKBOX_DATA
-command: set -o pipefail; fwts_test -f none -l $CHECKBOX_DATA/suspend_single -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee $CHECKBOX_DATA/suspend_single_times.log
+environ: PLAINBOX_SESSION_SHARE
+command: set -o pipefail; fwts_test -f none -l $PLAINBOX_SESSION_SHARE/suspend_single -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee $PLAINBOX_SESSION_SHARE/suspend_single_times.log
 estimated_duration: 90.000
 
 plugin: shell
-name: suspend/suspend-single-log-check
-command: [ -e $CHECKBOX_DATA/suspend_single.log ] && sleep_test_log_check -v s3 $CHECKBOX_DATA/suspend_single.log
+id: suspend/suspend-single-log-check
+estimated_duration: 1.2
+command: [ -e $PLAINBOX_SESSION_SHARE/suspend_single.log ] && sleep_test_log_check -v s3 $PLAINBOX_SESSION_SHARE/suspend_single.log
 _description:
 Automated check of the suspend log to look for errors reported by fwts
 
 plugin: attachment
-name: suspend/suspend-single-log-attach
-command: [ -e $CHECKBOX_DATA/suspend_single.log ] && cat $CHECKBOX_DATA/suspend_single.log
+id: suspend/suspend-single-log-attach
+command: [ -e $PLAINBOX_SESSION_SHARE/suspend_single.log ] && cat $PLAINBOX_SESSION_SHARE/suspend_single.log
 _description:
 Attaches the log from the single suspend/resume test to the results
 
 plugin: shell
-name: suspend/suspend-time-check
-command: [ -e $CHECKBOX_DATA/suspend_single_times.log ] && sleep_time_check $CHECKBOX_DATA/suspend_single_times.log
+id: suspend/suspend-time-check
+estimated_duration: 1.2
+command: [ -e $PLAINBOX_SESSION_SHARE/suspend_single_times.log ] && sleep_time_check $PLAINBOX_SESSION_SHARE/suspend_single_times.log
 _description:
 Checks the sleep times to ensure that a machine suspends and resumes within a given threshold
 
 plugin: user-interact-verify
-name: power-management/usb_wakeup_keyboard
+id: power-management/usb_wakeup_keyboard
 user: root
 depends: suspend/suspend_advanced
+estimated_duration: 120.0
 command: pm-suspend
 _description:
 PURPOSE:
@@ -270,9 +284,10 @@ _description:
 Did the system wake up from suspend mode when you pressed a keyboard key?
 
 plugin: user-interact-verify
-name: power-management/usb_wakeup_mouse
+id: power-management/usb_wakeup_mouse
 user: root
 depends: suspend/suspend_advanced
+estimated_duration: 120.0
 command: pm-suspend
 _description:
 PURPOSE:
@@ -285,19 +300,21 @@ _description:
 Did the system wake up from suspend mode when you pressed the mouse button?
 
 plugin: shell
-name: suspend/network_after_suspend
+id: suspend/network_after_suspend
+estimated_duration: 20.0
 depends: suspend/suspend_advanced suspend/network_before_suspend
 _description: Test the network after resuming.
-command: network_wait; gateway_ping_test | diff $CHECKBOX_DATA/network_before_suspend.txt -
+command: network_wait; gateway_ping_test | diff $PLAINBOX_SESSION_SHARE/network_before_suspend.txt -
 
 plugin: shell
-name: suspend/resolution_after_suspend
+id: suspend/resolution_after_suspend
 depends: suspend/suspend_advanced suspend/resolution_before_suspend
+estimated_duration: 1.2
 _description: Test to see that we have the same resolution after resuming as before.
-command: xrandr -q |grep '*'| awk '{print $1}' | diff $CHECKBOX_DATA/resolution_before_suspend.txt -
+command: xrandr -q |grep '*'| awk '{print $1}' | diff $PLAINBOX_SESSION_SHARE/resolution_before_suspend.txt -
 
 plugin: shell
-name: suspend/audio_after_suspend
+id: suspend/audio_after_suspend
 estimated_duration: 1.0
 requires:
 device.category == 'AUDIO'
@@ -305,46 +322,52 @@ requires:
 depends: suspend/suspend_advanced suspend/audio_before_suspend
 _description: Verify that mixer settings after suspend are the same as before suspend.
 command:
- audio_settings store --file=$CHECKBOX_DATA/audio_settings_after_suspend; diff $CHECKBOX_DATA/audio_settings_before_suspend $CHECKBOX_DATA/audio_settings_after_suspend
+ audio_settings store --file=$PLAINBOX_SESSION_SHARE/audio_settings_after_suspend; diff $PLAINBOX_SESSION_SHARE/audio_settings_before_suspend $PLAINBOX_SESSION_SHARE/audio_settings_after_suspend
 
 plugin: shell
-name: suspend/audio_after_suspend_auto
+id: suspend/audio_after_suspend_auto
+estimated_duration: 1.2
 requires:
 device.category == 'AUDIO'
 package.name == 'alsa-base'
 depends: suspend/suspend_advanced_auto suspend/audio_before_suspend
 _description: Verify that mixer settings after suspend are the same as before suspend.
 command:
- audio_settings store --file=$CHECKBOX_DATA/audio_settings_after_suspend; diff $CHECKBOX_DATA/audio_settings_before_suspend $CHECKBOX_DATA/audio_settings_after_suspend
+ audio_settings store --file=$PLAINBOX_SESSION_SHARE/audio_settings_after_suspend; diff $PLAINBOX_SESSION_SHARE/audio_settings_before_suspend $PLAINBOX_SESSION_SHARE/audio_settings_after_suspend
 
 plugin: shell
-name: suspend/cpu_after_suspend
+id: suspend/cpu_after_suspend
+estimated_duration: 1.2
 depends: suspend/suspend_advanced suspend/cpu_before_suspend
 _description: Verify that all CPUs are online after resuming.
-command: cpuinfo_resource | diff $CHECKBOX_DATA/cpuinfo_before_suspend -
+command: cpuinfo_resource | diff $PLAINBOX_SESSION_SHARE/cpuinfo_before_suspend -
 
 plugin: shell
-name: suspend/cpu_after_suspend_auto
+id: suspend/cpu_after_suspend_auto
+estimated_duration: 1.2
 depends: suspend/suspend_advanced_auto suspend/cpu_before_suspend
 _description: Verify that all CPUs are online after resuming.
-command: cpuinfo_resource | diff $CHECKBOX_DATA/cpuinfo_before_suspend -
+command: cpuinfo_resource | diff $PLAINBOX_SESSION_SHARE/cpuinfo_before_suspend -
 
 plugin: shell
-name: suspend/memory_after_suspend
+id: suspend/memory_after_suspend
+estimated_duration: 1.2
 depends: suspend/suspend_advanced suspend/memory_before_suspend
 _description:
 Verify that all memory is available after resuming from suspend.
-command: meminfo_resource | diff $CHECKBOX_DATA/meminfo_before_suspend -
+command: meminfo_resource | diff $PLAINBOX_SESSION_SHARE/meminfo_before_suspend -
 
 plugin: shell
-name: suspend/memory_after_suspend_auto
+id: suspend/memory_after_suspend_auto
+estimated_duration: 1.2
 depends: suspend/suspend_advanced_auto suspend/memory_before_suspend
 _description:
 Verify that all memory is available after resuming from suspend.
-command: meminfo_resource | diff $CHECKBOX_DATA/meminfo_before_suspend -
+command: meminfo_resource | diff $PLAINBOX_SESSION_SHARE/meminfo_before_suspend -
 
 plugin: manual
-name: suspend/display_after_suspend
+id: suspend/display_after_suspend
+estimated_duration: 120.0
 depends: suspend/suspend_advanced
 _description:
 PURPOSE:
@@ -355,11 +378,11 @@ _description:
 Does the display work normally after resuming from suspend?
 
 plugin: shell
-name: suspend/wireless_after_suspend
+id: suspend/wireless_after_suspend
 depends: suspend/suspend_advanced suspend/wireless_before_suspend
 requires:
 device.category == 'WIRELESS'
-command: connect_wireless && gateway_ping_test --interface=`nmcli dev list | grep -B 1 wireless | grep GENERAL.DEVICE | awk '{print $2}'` && for con in `cat $CHECKBOX_DATA/connections`; do nmcli con up uuid "$con"; done
+command: connect_wireless && gateway_ping_test --interface=`nmcli dev list | grep -B 1 wireless | grep GENERAL.DEVICE | awk '{print $2}'` && for con in `cat $PLAINBOX_SESSION_SHARE/connections`; do nmcli con up uuid "$con"; done
 estimated_duration: 20.0
 _description:
 This test checks that the wireless interface is working after suspending the system. It
@@ -367,8 +390,9 @@ _description:
 connection is working as expected.
 
 plugin: shell
-name: suspend/wireless_connection_after_suspend_wpa_bg
+id: suspend/wireless_connection_after_suspend_wpa_bg
 depends: suspend/suspend_advanced
+estimated_duration: 20.0
 requires:
 device.category == 'WIRELESS'
 environment.ROUTERS == 'multiple'
@@ -380,8 +404,9 @@ _description:
 security and the 802.11b/g protocols after the system has been suspended.
 
 plugin: shell
-name: suspend/wireless_connection_after_suspend_open_bg
+id: suspend/wireless_connection_after_suspend_open_bg
 depends: suspend/suspend_advanced
+estimated_duration: 1.2
 requires:
 device.category == 'WIRELESS'
 environment.ROUTERS == 'multiple'
@@ -393,11 +418,13 @@ _description:
 security and the 802.11b/g protocols after the system has been suspended.
 
 plugin: shell
-name: suspend/wireless_connection_after_suspend_wpa_n
+id: suspend/wireless_connection_after_suspend_wpa_n
 depends: suspend/suspend_advanced
+estimated_duration: 1.2
 requires:
 device.category == 'WIRELESS'
 environment.ROUTERS == 'multiple'
+ IEEE_80211.n == 'supported'
 user: root
 environ: WPA_N_SSID WPA_N_PSK
 command: trap "rm -f /etc/NetworkManager/system-connections/$WPA_N_SSID" EXIT; create_connection wifi $WPA_N_SSID --security=wpa --key=$WPA_N_PSK; gateway_ping_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
@@ -406,11 +433,13 @@ _description:
 security and the 802.11n protocol after the system has been suspended.
 
 plugin: shell
-name: suspend/wireless_connection_after_suspend_open_n
+id: suspend/wireless_connection_after_suspend_open_n
 depends: suspend/suspend_advanced
+estimated_duration: 1.2
 requires:
 device.category == 'WIRELESS'
 environment.ROUTERS == 'multiple'
+ IEEE_80211.n == 'supported'
 user: root
 environ: OPEN_N_SSID
 command: trap "rm -f /etc/NetworkManager/system-connections/$OPEN_N_SSID" EXIT; create_connection wifi $OPEN_N_SSID; gateway_ping_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
@@ -419,8 +448,39 @@ _description:
 security and the 802.11n protocol after the system has been suspended.
 
 plugin: shell
-name: suspend/wireless_connection_after_suspend_wpa_bg_auto
+id: suspend/wireless_connection_after_suspend_wpa_ac
+depends: suspend/suspend_advanced
+estimated_duration: 1.2
+requires:
+ device.category == 'WIRELESS'
+ environment.ROUTERS == 'multiple'
+ IEEE_80211.ac == 'supported'
+user: root
+environ: WPA_AC_SSID WPA_AC_PSK
+command: trap "rm -f /etc/NetworkManager/system-connections/$WPA_AC_SSID" EXIT; create_connection wifi $WPA_AC_SSID --security=wpa --key=$WPA_AC_PSK; gateway_ping_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+_description:
+ Tests that the systems wireless hardware can connect to a router using WPA
+ security and the 802.11ac protocol after the system has been suspended.
+
+plugin: shell
+id: suspend/wireless_connection_after_suspend_open_ac
+depends: suspend/suspend_advanced
+estimated_duration: 1.2
+requires:
+ device.category == 'WIRELESS'
+ environment.ROUTERS == 'multiple'
+ IEEE_80211.ac == 'supported'
+user: root
+environ: OPEN_AC_SSID
+command: trap "rm -f /etc/NetworkManager/system-connections/$OPEN_AC_SSID" EXIT; create_connection wifi $OPEN_AC_SSID; gateway_ping_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+_description:
+ Tests that the systems wireless hardware can connect to a router using no
+ security and the 802.11ac protocol after the system has been suspended.
+
+plugin: shell
+id: suspend/wireless_connection_after_suspend_wpa_bg_auto
 depends: suspend/suspend_advanced_auto
+estimated_duration: 1.2
 requires:
 device.category == 'WIRELESS'
 environment.ROUTERS == 'multiple'
@@ -432,8 +492,9 @@ _description:
 security and the 802.11b/g protocols after the system has been suspended.
 
 plugin: shell
-name: suspend/wireless_connection_after_suspend_open_bg_auto
+id: suspend/wireless_connection_after_suspend_open_bg_auto
 depends: suspend/suspend_advanced_auto
+estimated_duration: 1.2
 requires:
 device.category == 'WIRELESS'
 environment.ROUTERS == 'multiple'
@@ -445,8 +506,9 @@ _description:
 security and the 802.11b/g protocols after the system has been suspended.
 
 plugin: shell
-name: suspend/wireless_connection_after_suspend_wpa_n_auto
+id: suspend/wireless_connection_after_suspend_wpa_n_auto
 depends: suspend/suspend_advanced_auto
+estimated_duration: 1.2
 requires:
 device.category == 'WIRELESS'
 environment.ROUTERS == 'multiple'
@@ -458,8 +520,9 @@ _description:
 security and the 802.11n protocol after the system has been suspended.
 
 plugin: shell
-name: suspend/wireless_connection_after_suspend_open_n_auto
+id: suspend/wireless_connection_after_suspend_open_n_auto
 depends: suspend/suspend_advanced_auto
+estimated_duration: 1.2
 requires:
 device.category == 'WIRELESS'
 environment.ROUTERS == 'multiple'
@@ -470,14 +533,43 @@ _description:
 Tests that the systems wireless hardware can connect to a router using no
 security and the 802.11n protocol after the system has been suspended.
 
+plugin: shell
+id: suspend/wireless_connection_after_suspend_wpa_ac_auto
+depends: suspend/suspend_advanced_auto
+estimated_duration: 1.2
+requires:
+ device.category == 'WIRELESS'
+ environment.ROUTERS == 'multiple'
+user: root
+environ: WPA_AC_SSID WPA_AC_PSK
+command: trap "rm -f /etc/NetworkManager/system-connections/$WPA_AC_SSID" EXIT; create_connection wifi $WPA_AC_SSID --security=wpa --key=$WPA_AC_PSK; gateway_ping_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+_description:
+ Tests that the systems wireless hardware can connect to a router using WPA
+ security and the 802.11ac protocol after the system has been suspended.
+
+plugin: shell
+id: suspend/wireless_connection_after_suspend_open_ac_auto
+depends: suspend/suspend_advanced_auto
+estimated_duration: 1.2
+requires:
+ device.category == 'WIRELESS'
+ environment.ROUTERS == 'multiple'
+user: root
+environ: OPEN_AC_SSID
+command: trap "rm -f /etc/NetworkManager/system-connections/$OPEN_AC_SSID" EXIT; create_connection wifi $OPEN_AC_SSID; gateway_ping_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+_description:
+ Tests that the systems wireless hardware can connect to a router using no
+ security and the 802.11ac protocol after the system has been suspended.
+
 plugin: local
-name: suspend/iperf_after_suspend_ether_auto
+id: suspend/iperf_after_suspend_ether_auto
+estimated_duration: 30.0
 requires:
 device.category == 'NETWORK'
 command: 
 cat <<'EOF' | run_templates -s 'udev_resource | filter_templates -w "category=NETWORK" | awk "/path: / { print \$2 }" | xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do echo \$0 \$i; done"'
 plugin: shell
- name: suspend/iperf_after_suspend_ether_auto_$2
+ id: suspend/iperf_after_suspend_ether_auto_$2
 depends: suspend/suspend_advanced
 requires: device.path == "$1"
 user: root
@@ -489,13 +581,14 @@ _description:
 This is an automated test to gather some info on the current state of your network devices. If no devices are found, the test will exit with an error.
 
 plugin: local
-name: suspend/iperf_after_suspend_wifi_auto
+id: suspend/iperf_after_suspend_wifi_auto
+estimated_duration: 30.0
 requires:
 device.category == 'WIRELESS'
 command: 
 cat <<'EOF' | run_templates -s 'udev_resource | filter_templates -w "category=WIRELESS" | awk "/path: / { print \$2 }" | xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do echo \$0 \$i; done"'
 plugin: shell
- name: suspend/iperf_before_suspend_wifi_auto_$2
+ id: suspend/iperf_before_suspend_wifi_auto_$2
 depends: suspend/suspend_advanced
 requires: device.path == "$1"
 user: root
@@ -507,8 +600,9 @@ _description:
 This is an automated test to gather some info on the current state of your network devices. If no devices are found, the test will exit with an error.
 
 plugin: user-interact-verify
-name: suspend/wireless_connection_after_suspend_wpa_bg_manual
+id: suspend/wireless_connection_after_suspend_wpa_bg_manual
 depends: suspend/suspend_advanced
+estimated_duration: 120.0
 requires:
 device.category == 'WIRELESS'
 environment.ROUTERS == 'single'
@@ -529,8 +623,9 @@ _description:
 Verification is automated, do not change the automatically selected result.
 
 plugin: user-interact-verify
-name: suspend/wireless_connection_after_suspend_open_bg_manual
+id: suspend/wireless_connection_after_suspend_open_bg_manual
 depends: suspend/suspend_advanced
+estimated_duration: 120.0
 requires:
 device.category == 'WIRELESS'
 environment.ROUTERS == 'single'
@@ -551,8 +646,9 @@ _description:
 Verification is automated, do not change the automatically selected result.
 
 plugin: user-interact-verify
-name: suspend/wireless_connection_after_suspend_wpa_n_manual
+id: suspend/wireless_connection_after_suspend_wpa_n_manual
 depends: suspend/suspend_advanced
+estimated_duration: 120.0
 requires:
 device.category == 'WIRELESS'
 environment.ROUTERS == 'single'
@@ -573,8 +669,9 @@ _description:
 Verification is automated, do not change the automatically selected result.
 
 plugin: user-interact-verify
-name: suspend/wireless_connection_after_suspend_open_n_manual
+id: suspend/wireless_connection_after_suspend_open_n_manual
 depends: suspend/suspend_advanced
+estimated_duration: 120.0
 requires:
 device.category == 'WIRELESS'
 environment.ROUTERS == 'single'
@@ -594,9 +691,56 @@ _description:
 VERIFICATION:
 Verification is automated, do not change the automatically selected result.
 
+plugin: user-interact-verify
+id: suspend/wireless_connection_after_suspend_wpa_ac_manual
+depends: suspend/suspend_advanced
+estimated_duration: 120.0
+requires:
+ device.category == 'WIRELESS'
+ environment.ROUTERS == 'single'
+user: root
+environ: ROUTER_SSID ROUTER_PSK
+command: trap "nmcli con delete id $ROUTER_SSID" EXIT; create_connection wifi $ROUTER_SSID --security=wpa --key=$ROUTER_PSK && gateway_ping_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+_description:
+ PURPOSE:
+ Tests that the systems wireless hardware can connect to a router using WPA
+ security and the 802.11ac protocol.
+ STEPS:
+ 1. Open your routers configuration tool
+ 2. Change the settings to only accept connections on the 802.11ac protocol.
+ 3. Make sure the SSID is set to ROUTER_SSID
+ 4. Change the security settings to use WPA2 and ensure the PSK matches that set in ROUTER_PSK
+ 5. Click the 'Test' button to create a connection to the router and test the connection
+ VERIFICATION:
+ Verification is automated, do not change the automatically selected result.
+
+plugin: user-interact-verify
+id: suspend/wireless_connection_after_suspend_open_ac_manual
+depends: suspend/suspend_advanced
+estimated_duration: 120.0
+requires:
+ device.category == 'WIRELESS'
+ environment.ROUTERS == 'single'
+user: root
+environ: ROUTER_SSID
+command: trap "nmcli con delete id $ROUTER_SSID" EXIT; create_connection wifi $ROUTER_SSID && gateway_ping_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+_description:
+ PURPOSE:
+ Tests that the systems wireless hardware can connect to a router using
+ no security and the 802.11ac protocol.
+ STEPS:
+ 1. Open your routers configuration tool
+ 2. Change the settings to only accept connections on the 802.11ac protocol.
+ 3. Make sure the SSID is set to ROUTER_SSID
+ 4. Change the security settings to use no security
+ 5. Click the 'Test' button to create a connection to the router and test the connection
+ VERIFICATION:
+ Verification is automated, do not change the automatically selected result.
+
 plugin: shell
-name: suspend/bluetooth_detect_after_suspend
+id: suspend/bluetooth_detect_after_suspend
 depends: suspend/suspend_advanced bluetooth/detect-output
+estimated_duration: 1.2
 requires:
 package.name == 'bluez'
 device.category == 'BLUETOOTH'
@@ -610,7 +754,7 @@ command:
 sleep 3
 fi
 output=$(hcitool dev | tail -n+2 | awk '{print $2}')
- echo $output | diff $CHECKBOX_DATA/bluetooth_address -
+ echo $output | diff $PLAINBOX_SESSION_SHARE/bluetooth_address -
 if [ -z "$output" ]; then
 echo "BT hardware not available"
 exit 1
@@ -619,8 +763,9 @@ _description:
 This test grabs the hardware address of the bluetooth adapter after suspend and compares it to the address grabbed before suspend.
 
 plugin: shell
-name: suspend/bluetooth_obex_after_suspend
+id: suspend/bluetooth_obex_after_suspend
 depends: suspend/suspend_advanced suspend/bluetooth_obex_before_suspend
+estimated_duration: 10.0
 requires:
 package.name == 'bluez'
 package.name == 'obexd-client'
@@ -641,13 +786,14 @@ command:
 rfkill unblock bluetooth
 sleep 3
 fi
- obex_send $BTDEVADDR $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg
+ obex_send $BTDEVADDR $PLAINBOX_PROVIDER_DATA/images/JPEG_Color_Image_Ubuntu.jpg
 _description:
 This is an automated Bluetooth file transfer test. It sends an image to the device specified by the BTDEVADDR environment variable.
 
 plugin: shell
-name: suspend/bluetooth_obex_after_suspend_auto
+id: suspend/bluetooth_obex_after_suspend_auto
 depends: suspend/suspend_advanced_auto suspend/bluetooth_obex_before_suspend
+estimated_duration: 10.0
 requires:
 package.name == 'bluez'
 package.name == 'obexd-client'
@@ -668,13 +814,14 @@ command:
 rfkill unblock bluetooth
 sleep 3
 fi
- obex_send $BTDEVADDR $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg
+ obex_send $BTDEVADDR $PLAINBOX_PROVIDER_DATA/images/JPEG_Color_Image_Ubuntu.jpg
 _description:
 This is an automated Bluetooth file transfer test. It sends an image to the device specified by the BTDEVADDR environment variable.
 
 plugin: shell
-name: suspend/bluetooth_obex_send_after_suspend
+id: suspend/bluetooth_obex_send_after_suspend
 depends: suspend/suspend_advanced
+estimated_duration: 10.0
 requires:
 package.name == 'bluez'
 package.name == 'obexftp'
@@ -695,13 +842,14 @@ command:
 rfkill unblock bluetooth
 sleep 3
 fi
- set -o pipefail; bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR send 2>&1 | ansi_parser
+ set -o pipefail; bluetooth_test $PLAINBOX_PROVIDER_DATA/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR send 2>&1 | ansi_parser
 _description:
 This is an automated Bluetooth file transfer test. It sends an image to the device specified by the BTDEVADDR environment variable.
 
 plugin: shell
-name: suspend/bluetooth_obex_send_after_suspend_auto
+id: suspend/bluetooth_obex_send_after_suspend_auto
 depends: suspend/suspend_advanced_auto
+estimated_duration: 10.0
 requires:
 package.name == 'bluez'
 package.name == 'obexftp'
@@ -722,13 +870,14 @@ command:
 rfkill unblock bluetooth
 sleep 3
 fi
- set -o pipefail; bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR send 2>&1 | ansi_parser
+ set -o pipefail; bluetooth_test $PLAINBOX_PROVIDER_DATA/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR send 2>&1 | ansi_parser
 _description:
 This is an automated Bluetooth file transfer test. It sends an image to the device specified by the BTDEVADDR environment variable.
 
 plugin: shell
-name: suspend/bluetooth_obex_browse_after_suspend
+id: suspend/bluetooth_obex_browse_after_suspend
 depends: suspend/suspend_advanced
+estimated_duration: 10.0
 requires:
 package.name == 'bluez'
 package.name == 'obexftp'
@@ -749,13 +898,14 @@ command:
 rfkill unblock bluetooth
 sleep 3
 fi
- set -o pipefail; bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR browse 2>&1 | ansi_parser
+ set -o pipefail; bluetooth_test $PLAINBOX_PROVIDER_DATA/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR browse 2>&1 | ansi_parser
 _description:
 This is an automated Bluetooth test. It emulates browsing on a remote device specified by the BTDEVADDR environment variable.
 
 plugin: shell
-name: suspend/bluetooth_obex_browse_after_suspend_auto
+id: suspend/bluetooth_obex_browse_after_suspend_auto
 depends: suspend/suspend_advanced_auto
+estimated_duration: 20.0
 requires:
 package.name == 'bluez'
 package.name == 'obexftp'
@@ -776,12 +926,13 @@ command:
 rfkill unblock bluetooth
 sleep 3
 fi
- set -o pipefail; bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR browse 2>&1 | ansi_parser
+ set -o pipefail; bluetooth_test $PLAINBOX_PROVIDER_DATA/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR browse 2>&1 | ansi_parser
 _description:
 This is an automated Bluetooth test. It emulates browsing on a remote device specified by the BTDEVADDR environment variable.
 
 plugin: shell
-name: suspend/bluetooth_obex_get_after_suspend
+id: suspend/bluetooth_obex_get_after_suspend
+estimated_duration: 20.0
 depends: suspend/suspend_advanced
 requires:
 package.name == 'bluez'
@@ -803,13 +954,14 @@ command:
 rfkill unblock bluetooth
 sleep 3
 fi
- set -o pipefail; bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR get 2>&1 | ansi_parser
+ set -o pipefail; bluetooth_test $PLAINBOX_PROVIDER_DATA/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR get 2>&1 | ansi_parser
 _description:
 This is an automated Bluetooth test. It receives the given file from a remote host specified by the BTDEVADDR environment variable
 
 plugin: shell
-name: suspend/bluetooth_obex_get_after_suspend_auto
+id: suspend/bluetooth_obex_get_after_suspend_auto
 depends: suspend/suspend_advanced_auto
+estimated_duration: 20.0
 requires:
 package.name == 'bluez'
 package.name == 'obexftp'
@@ -830,18 +982,19 @@ command:
 rfkill unblock bluetooth
 sleep 3
 fi
- set -o pipefail; bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR get 2>&1 | ansi_parser
+ set -o pipefail; bluetooth_test $PLAINBOX_PROVIDER_DATA/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR get 2>&1 | ansi_parser
 _description:
 This is an automated Bluetooth test. It receives the given file from a remote host specified by the BTDEVADDR environment variable
 
 plugin: user-interact-verify
-name: suspend/bluetooth_obex_after_suspend_manual
+id: suspend/bluetooth_obex_after_suspend_manual
 depends: suspend/suspend_advanced suspend/bluetooth_obex_before_suspend_manual
+estimated_duration: 120.0
 requires:
 package.name == 'bluez'
 package.name == 'obexd-client'
 device.category == 'BLUETOOTH'
-command: rfkill unblock bluetooth; obex_send `bluetooth_scan` $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg
+command: rfkill unblock bluetooth; obex_send `bluetooth_scan` $PLAINBOX_PROVIDER_DATA/images/JPEG_Color_Image_Ubuntu.jpg
 _description:
 PURPOSE:
 This test will send the image 'JPEG_Color_Image_Ubuntu.jpg' to a specified device
@@ -852,10 +1005,11 @@ _description:
 Was the data correctly transferred?
 
 plugin: user-interact-verify
-name: suspend/cycle_resolutions_after_suspend
+id: suspend/cycle_resolutions_after_suspend
+estimated_duration: 120.0
 requires: package.name == 'xorg'
 depends: suspend/suspend_advanced graphics/cycle_resolution
-command: xrandr_cycle --keyword=after_suspend --screenshot-dir $CHECKBOX_DATA
+command: xrandr_cycle --keyword=after_suspend --screenshot-dir $PLAINBOX_SESSION_SHARE
 _description:
 PURPOSE:
 This test will cycle through the detected display modes
@@ -865,22 +1019,24 @@ _description:
 Did your display look fine in the detected mode?
 
 plugin: shell
-name: suspend/cycle_resolutions_after_suspend_auto
+id: suspend/cycle_resolutions_after_suspend_auto
+estimated_duration: 1.2
 requires: package.name == 'xorg'
 depends: suspend/suspend_advanced_auto graphics/cycle_resolution
 _description:
 This test will check to make sure supported video modes work after a suspend and resume.
 This is done automatically by taking screenshots and uploading them as an attachment.
-command: xrandr_cycle --keyword=after_suspend --screenshot-dir $CHECKBOX_DATA
+command: xrandr_cycle --keyword=after_suspend --screenshot-dir $PLAINBOX_SESSION_SHARE
 
 plugin: attachment
-name: suspend/xrandr_screens_after_suspend.tar.gz
+id: suspend/xrandr_screens_after_suspend.tar.gz
 depends: suspend/cycle_resolutions_after_suspend_auto
-command: [ -e $CHECKBOX_DATA/xrandr_screens_after_suspend.tgz ] && cat $CHECKBOX_DATA/xrandr_screens_after_suspend.tgz
+command: [ -e $PLAINBOX_SESSION_SHARE/xrandr_screens_after_suspend.tgz ] && cat $PLAINBOX_SESSION_SHARE/xrandr_screens_after_suspend.tgz
 _description: This attaches screenshots from the suspend/cycle_resolutions_after_suspend_auto test to the results submission.
 
 plugin: shell
-name: suspend/record_playback_after_suspend
+id: suspend/record_playback_after_suspend
+estimated_duration: 10.0
 depends: suspend/suspend_advanced
 requires:
 package.name == 'python3-gi'
@@ -895,7 +1051,8 @@ _description:
 This will check to make sure that your audio device works properly after a suspend and resume. This may work fine with speakers and onboard microphone, however, it works best if used with a cable connecting the audio-out jack to the audio-in jack.
 
 plugin: shell
-name: suspend/record_playback_after_suspend_auto
+id: suspend/record_playback_after_suspend_auto
+estimated_duration: 10.0
 depends: suspend/suspend_advanced_auto
 requires:
 package.name == 'python3-gi'
@@ -910,16 +1067,17 @@ _description:
 This will check to make sure that your audio device works properly after a suspend and resume. This may work fine with speakers and onboard microphone, however, it works best if used with a cable connecting the audio-out jack to the audio-in jack.
 
 plugin: attachment
-name: suspend/suspend-auto-single-log-attach
-command: [ -e $CHECKBOX_DATA/suspend_auto_single_log ] && cat $CHECKBOX_DATA/suspend_auto_single_log
+id: suspend/suspend-auto-single-log-attach
+command: [ -e $PLAINBOX_SESSION_SHARE/suspend_auto_single_log ] && cat $PLAINBOX_SESSION_SHARE/suspend_auto_single_log
 _description:
 Attaches the log from the single suspend/resume test to the results
 
 plugin: shell
-name: suspend/screenshot_after_suspend
+id: suspend/screenshot_after_suspend
+estimated_duration: 10.0
 depends: suspend/suspend_advanced_auto
 requires: package.name == 'fswebcam'
-command: set -o pipefail; camera_test still --device=/dev/external_webcam -f ${CHECKBOX_DATA}/screenshot_after_suspend.jpg -q 2>&1 | ansi_parser
+command: set -o pipefail; camera_test still --device=/dev/external_webcam -f ${PLAINBOX_SESSION_SHARE}/screenshot_after_suspend.jpg -q 2>&1 | ansi_parser
 _description:
 PURPOSE:
 Take a screengrab of the current screen after suspend (logged on Unity desktop)
@@ -929,13 +1087,14 @@ _description:
 Review attachment manually later
 
 plugin: attachment
-name: screenshot_after_suspend.jpg
+id: screenshot_after_suspend.jpg
 depends: suspend/screenshot_after_suspend
-command: base64 ${CHECKBOX_DATA}/screenshot_after_suspend.jpg
+command: base64 ${PLAINBOX_SESSION_SHARE}/screenshot_after_suspend.jpg
 _description: Attaches the screenshot captured in graphics/screenshot.
 
 plugin: shell
-name: suspend/gpu_lockup_after_suspend
+id: suspend/gpu_lockup_after_suspend
+estimated_duration: 10.0
 requires:
 package.name == 'wmctrl'
 package.name == 'mesa-utils'
@@ -953,7 +1112,7 @@ _description:
 After a 60s workload, check kern.log for reported GPU errors
 
 plugin: shell
-name: suspend/wifi_resume_time
+id: suspend/wifi_resume_time
 depends: suspend/suspend_advanced
 requires:
 device.category == 'WIRELESS'
@@ -964,7 +1123,8 @@ _description:
 after a suspend/resume cycle.
 
 plugin: shell
-name: suspend/wifi_resume_time_auto
+id: suspend/wifi_resume_time_auto
+estimated_duration: 1.2
 depends: suspend/suspend_advanced_auto
 requires:
 device.category == 'WIRELESS'
@@ -974,8 +1134,9 @@ _description:
 after a suspend/resume cycle.
 
 plugin: shell
-name: suspend/network_resume_time
+id: suspend/network_resume_time
 depends: suspend/suspend_advanced
+estimated_duration: 1.2
 requires:
 device.category == 'NETWORK'
 command: network_reconnect_resume_test -t 10 -d wired
@@ -984,8 +1145,9 @@ _description:
 after a suspend/resume cycle.
 
 plugin: shell
-name: suspend/network_resume_time_auto
+id: suspend/network_resume_time_auto
 depends: suspend/suspend_advanced_auto
+estimated_duration: 1.2
 requires:
 device.category == 'NETWORK'
 command: network_reconnect_resume_test -t 10 -d wired
@@ -994,8 +1156,9 @@ _description:
 after a suspend/resume cycle.
 
 plugin: manual
-name: suspend/led_after_suspend/power
+id: suspend/led_after_suspend/power
 depends: suspend/suspend_advanced
+estimated_duration: 120.0
 _description:
 PURPOSE:
 Validate that the power LED operated the same after resuming from suspend
@@ -1005,7 +1168,8 @@ _description:
 Does the power LED remain on after resuming from suspend?
 
 plugin: manual
-name: suspend/led_after_suspend/battery-charging
+id: suspend/led_after_suspend/battery-charging
+estimated_duration: 120.0
 depends: suspend/suspend_advanced
 _description:
 PURPOSE:
@@ -1017,8 +1181,9 @@ _description:
 Did the battery indicator LED still turn orange after resuming from suspend?
 
 plugin: manual
-name: suspend/led_after_suspend/battery-charged
+id: suspend/led_after_suspend/battery-charged
 depends: suspend/suspend_advanced
+estimated_duration: 120.0
 _description:
 PURPOSE:
 Validate that the battery LED properly displays charged status after resuming from suspend
@@ -1030,8 +1195,9 @@ _description:
 Does the orange battery LED still shut off when system is fully charged after resuming from suspend?
 
 plugin: manual
-name: suspend/led_after_suspend/battery-low
+id: suspend/led_after_suspend/battery-low
 depends: suspend/suspend_advanced
+estimated_duration: 120.0
 _description:
 PURPOSE:
 Validate that the battery LED indicated low power after resuming from suspend
@@ -1042,8 +1208,9 @@ _description:
 Does the LED light orange when battery is low after resuming from suspend?
 
 plugin: user-interact-verify
-name: suspend/led_after_suspend/hdd
+id: suspend/led_after_suspend/hdd
 depends: suspend/suspend_advanced
+estimated_duration: 120.0
 command: led_hdd_test
 _description:
 PURPOSE:
@@ -1055,7 +1222,8 @@ _description:
 Did the HDD LED still blink with HDD activity after resuming from suspend?
 
 plugin: user-interact-verify
-name: suspend/led_after_suspend/numeric-keypad
+id: suspend/led_after_suspend/numeric-keypad
+estimated_duration: 120.0
 depends: suspend/suspend_advanced
 command: keyboard_test
 _description:
@@ -1070,8 +1238,9 @@ _description:
 2. Numbers should only be entered in the keyboard verification window when the LED is on
 
 plugin: manual
-name: suspend/led_after_suspend/caps-lock
+id: suspend/led_after_suspend/caps-lock
 depends: suspend/suspend_advanced
+estimated_duration: 120.0
 _description:
 PURPOSE:
 Validate that the Caps Lock key operates the same before and after resuming from suspend
@@ -1082,8 +1251,9 @@ _description:
 Did the Cap Keys LED light as expected after resuming from suspend?
 
 plugin: manual
-name: suspend/led_after_suspend/wlan
+id: suspend/led_after_suspend/wlan
 depends: suspend/suspend_advanced
+estimated_duration: 120.0
 _description:
 PURPOSE:
 WLAN LED verification after resuming from suspend
@@ -1094,8 +1264,9 @@ _description:
 Did the WLAN LED light as expected after resuming from suspend?
 
 plugin: manual
-name: suspend/led_after_suspend/wlan-disabled
+id: suspend/led_after_suspend/wlan-disabled
 depends: suspend/suspend_advanced
+estimated_duration: 120.0
 _description:
 PURPOSE:
 Validate that WLAN LED shuts off when disabled after resuming from suspend
@@ -1108,8 +1279,9 @@ _description:
 Did the LED turn off then WLAN is disabled after resuming from suspend?
 
 plugin: manual
-name: suspend/led_after_suspend/bluetooth
+id: suspend/led_after_suspend/bluetooth
 depends: suspend/suspend_advanced
+estimated_duration: 120.0
 _description:
 PURPOSE:
 Validate that the Bluetooth LED turns on and off when BT is enabled/disabled after resuming from suspend
@@ -1122,7 +1294,8 @@ _description:
 Did the bluetooth LED turn off and on twice after resuming from suspend?
 
 plugin: user-interact-verify
-name: suspend/led_after_suspend/camera
+id: suspend/led_after_suspend/camera
+estimated_duration: 120.0
 depends:
 camera/detect
 suspend/suspend_advanced
@@ -1137,8 +1310,9 @@ _description:
 Did the camera LED still turn on and off after resuming from suspend?
 
 plugin: manual
-name: suspend/led_after_suspend/touchpad
+id: suspend/led_after_suspend/touchpad
 depends: suspend/suspend_advanced
+estimated_duration: 120.0
 _description:
 PURPOSE:
 Touchpad LED verification after resuming from suspend
@@ -1151,8 +1325,9 @@ _description:
 3. When the LED is off, the mouse pointer should not move on touchpad usage
 
 plugin: manual
-name: suspend/led_after_suspend/wireless
+id: suspend/led_after_suspend/wireless
 depends: suspend/suspend_advanced
+estimated_duration: 120.0
 _description:
 PURPOSE:
 Validate Wireless (WLAN + Bluetooth) LED operated the same after resuming from suspend
@@ -1167,8 +1342,9 @@ _description:
 Did the WLAN/Bluetooth LED light as expected after resuming from suspend?
 
 plugin: manual
-name: suspend/keys_after_suspend/brightness
+id: suspend/keys_after_suspend/brightness
 depends: suspend/suspend_advanced
+estimated_duration: 120.0
 requires: dmi.product in ['Notebook','Laptop','Portable']
 _description:
 PURPOSE:
@@ -1179,8 +1355,9 @@ _description:
 Did the brightness change following to your key presses after resuming from suspend?
 
 plugin: user-interact-verify
-name: suspend/keys_after_suspend/volume
+id: suspend/keys_after_suspend/volume
 depends: suspend/suspend_advanced
+estimated_duration: 120.0
 requires:
 device.category == 'KEYBOARD'
 user: root
@@ -1196,8 +1373,9 @@ _description:
 Did the volume change following to your key presses?
 
 plugin: user-interact-verify
-name: suspend/keys_after_suspend/mute
+id: suspend/keys_after_suspend/mute
 depends: suspend/suspend_advanced
+estimated_duration: 120.0
 requires:
 device.category == 'KEYBOARD'
 user: root
@@ -1212,8 +1390,9 @@ _description:
 Did the volume mute following your key presses?
 
 plugin: manual
-name: suspend/keys_after_suspend/sleep
+id: suspend/keys_after_suspend/sleep
 depends: suspend/suspend_advanced
+estimated_duration: 120.0
 requires:
 device.category == 'KEYBOARD'
 _description:
@@ -1226,8 +1405,9 @@ _description:
 Did the system go to sleep after pressing the sleep key after resuming from suspend?
 
 plugin: user-interact-verify
-name: suspend/keys_after_suspend/battery-info
+id: suspend/keys_after_suspend/battery-info
 depends: suspend/suspend_advanced
+estimated_duration: 120.0
 requires: dmi.product in ['Notebook','Laptop','Portable']
 user: root
 command: key_test -s '0xe071,0xef1:Battery Info'
@@ -1243,8 +1423,9 @@ _description:
 Did the Battery Info key work as expected after resuming from suspend?
 
 plugin: manual
-name: suspend/keys_after_suspend/wireless
+id: suspend/keys_after_suspend/wireless
 depends: suspend/suspend_advanced
+estimated_duration: 120.0
 requires: dmi.product in ['Notebook','Laptop','Portable']
 _description:
 PURPOSE:
@@ -1256,7 +1437,8 @@ _description:
 Did the wireless go off on the first press and on again on the second after resuming from suspend?
 
 plugin: user-interact-verify
-name: suspend/keys_after_suspend/media-control
+id: suspend/keys_after_suspend/media-control
+estimated_duration: 120.0
 depends: suspend/suspend_advanced
 requires:
 device.category == 'KEYBOARD'
@@ -1273,8 +1455,9 @@ _description:
 Do the keys work as expected after resuming from suspend?
 
 plugin: user-interact-verify
-name: suspend/keys_after_suspend/super
+id: suspend/keys_after_suspend/super
 depends: suspend/suspend_advanced
+estimated_duration: 120.0
 requires:
 device.category == 'KEYBOARD'
 user: root
@@ -1289,8 +1472,9 @@ _description:
 Does the super key work as expected after resuming from suspend?
 
 plugin: manual
-name: suspend/keys_after_suspend/video-out
+id: suspend/keys_after_suspend/video-out
 depends: suspend/suspend_advanced
+estimated_duration: 120.0
 requires: dmi.product in ['Notebook','Laptop','Portable']
 _description:
 PURPOSE:
@@ -1302,8 +1486,9 @@ _description:
 Check that the video signal can be mirrored, extended, displayed on external or onboard only, after resuming from suspend.
 
 plugin: manual
-name: suspend/keys_after_suspend/touchpad
+id: suspend/keys_after_suspend/touchpad
 depends: suspend/suspend_advanced
+estimated_duration: 120.0
 requires: dmi.product in ['Notebook','Laptop','Portable']
 _description:
 PURPOSE:
@@ -1316,7 +1501,8 @@ _description:
 Verify the touchpad has been disabled and re-enabled.
 
 plugin: user-interact
-name: suspend/usb_insert_after_suspend
+id: suspend/usb_insert_after_suspend
+estimated_duration: 30.0
 depends:
 suspend/suspend_advanced
 command: removable_storage_watcher insert usb
@@ -1333,7 +1519,8 @@ _description:
 automatically selected result.
 
 plugin: user-interact
-name: suspend/usb3_insert_after_suspend
+id: suspend/usb3_insert_after_suspend
+estimated_duration: 30.0
 requires:
 usb.usb3 == 'supported'
 depends:
@@ -1352,7 +1539,8 @@ _description:
 automatically selected result.
 
 plugin: user-interact
-name: suspend/usb_remove_after_suspend
+id: suspend/usb_remove_after_suspend
+estimated_duration: 30.0
 depends:
 suspend/usb_insert_after_suspend
 command: removable_storage_watcher remove usb
@@ -1368,7 +1556,8 @@ _description:
 automatically selected result.
 
 plugin: user-interact
-name: suspend/usb3_remove_after_suspend
+id: suspend/usb3_remove_after_suspend
+estimated_duration: 30.0
 depends:
 suspend/usb3_insert_after_suspend
 requires:
@@ -1386,7 +1575,8 @@ _description:
 automatically selected result.
 
 plugin: shell
-name: suspend/usb_storage_automated_after_suspend
+id: suspend/usb_storage_automated_after_suspend
+estimated_duration: 1.2
 depends: suspend/usb_insert_after_suspend
 user: root
 command: removable_storage_test -s 268400000 usb
@@ -1395,7 +1585,8 @@ _description:
 test is run.
 
 plugin: shell
-name: suspend/usb3_storage_automated_after_suspend
+id: suspend/usb3_storage_automated_after_suspend
+estimated_duration: 1.2
 requires:
 usb.usb3 == 'supported'
 depends: suspend/usb3_insert_after_suspend
@@ -1406,7 +1597,8 @@ _description:
 test is run.
 
 plugin: shell
-name: suspend/usb_storage_preinserted_after_suspend
+id: suspend/usb_storage_preinserted_after_suspend
+estimated_duration: 1.2
 user: root
 depends: suspend/suspend_advanced_auto
 command: removable_storage_test -l usb && removable_storage_test -s 268400000 usb
@@ -1416,7 +1608,8 @@ _description:
 is intended for servers and SRU automated testing.
 
 plugin: shell
-name: suspend/usb3_storage_preinserted_after_suspend
+id: suspend/usb3_storage_preinserted_after_suspend
+estimated_duration: 1.2
 user: root
 requires:
 usb.usb3 == 'supported'
@@ -1427,8 +1620,32 @@ _description:
 server has usb 3.0 storage devices plugged in prior to checkbox execution. It
 is intended for servers and SRU automated testing.
 
+plugin: shell
+id: suspend/usb_performance_after_suspend
+depends: suspend/usb_insert_after_suspend
+user: root
+estimated_duration: 45.00
+command: removable_storage_test -s 268400000 -p 15 usb
+_description:
+ This test will check that your USB 2.0 port transfers data at a
+ minimum expected speed.
+
+plugin: shell
+id: suspend/usb3_superspeed_performance_after_suspend
+requires:
+ usb.usb3 == 'supported'
+depends: suspend/usb3_insert_after_suspend
+user: root
+estimated_duration: 45.00
+command: removable_storage_test -s 268400000 -m 500000000 -p 60 usb
+_description:
+ This test will check that your USB 3.0 port transfers data at a
+ minimum expected speed in accordance with the specification of
+ USB 3.0 SuperSpeed mode.
+
 plugin: user-interact
-name: suspend/mmc-insert-after-suspend
+id: suspend/mmc-insert-after-suspend
+estimated_duration: 30.0
 depends: suspend/suspend_advanced
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
@@ -1445,8 +1662,9 @@ _description:
 automatically selected result.
 
 plugin: shell
-name: suspend/mmc-storage-after-suspend
+id: suspend/mmc-storage-after-suspend
 depends: suspend/mmc-insert-after-suspend
+estimated_duration: 10.0
 user: root
 command: removable_storage_test -s 67120000 --memorycard sdio usb scsi
 _description:
@@ -1454,8 +1672,9 @@ _description:
 is run. It tests reading and writing to the MMC card after the system has been suspended.
 
 plugin: user-interact
-name: suspend/mmc-remove-after-suspend
+id: suspend/mmc-remove-after-suspend
 depends: suspend/mmc-insert-after-suspend
+estimated_duration: 30.0
 command: removable_storage_watcher --memorycard remove sdio usb scsi
 _description:
 PURPOSE:
@@ -1469,7 +1688,8 @@ _description:
 automatically selected result.
 
 plugin: user-interact
-name: suspend/sd-insert-after-suspend
+id: suspend/sd-insert-after-suspend
+estimated_duration: 30.0
 depends: suspend/suspend_advanced
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
@@ -1487,7 +1707,8 @@ _description:
 automatically selected result.
 
 plugin: shell
-name: suspend/sd-storage-after-suspend
+id: suspend/sd-storage-after-suspend
+estimated_duration: 10.0
 depends: suspend/sd-insert-after-suspend
 user: root
 command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
@@ -1496,7 +1717,8 @@ _description:
 is run. It tests reading and writing to the SD card after the system has been suspended.
 
 plugin: user-interact
-name: suspend/sd-remove-after-suspend
+id: suspend/sd-remove-after-suspend
+estimated_duration: 30.0
 depends: suspend/sd-insert-after-suspend
 command: removable_storage_watcher --memorycard remove sdio usb scsi
 _description:
@@ -1512,7 +1734,8 @@ _description:
 automatically selected result.
 
 plugin: user-interact
-name: suspend/sdhc-insert-after-suspend
+id: suspend/sdhc-insert-after-suspend
+estimated_duration: 30.0
 depends: suspend/suspend_advanced
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
@@ -1530,7 +1753,8 @@ _description:
 automatically selected result.
 
 plugin: shell
-name: suspend/sdhc-storage-after-suspend
+id: suspend/sdhc-storage-after-suspend
+estimated_duration: 10.0
 depends: suspend/sdhc-insert-after-suspend
 user: root
 command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
@@ -1539,7 +1763,8 @@ _description:
 is run. It tests reading and writing to the SDHC card after the system has been suspended.
 
 plugin: user-interact
-name: suspend/sdhc-remove-after-suspend
+id: suspend/sdhc-remove-after-suspend
+estimated_duration: 30.0
 depends: suspend/sdhc-insert-after-suspend
 command: removable_storage_watcher --memorycard remove sdio usb scsi
 _description:
@@ -1554,7 +1779,8 @@ _description:
 automatically selected result.
 
 plugin: user-interact
-name: mediacard/cf-insert-after-suspend
+id: mediacard/cf-insert-after-suspend
+estimated_duration: 30.0
 depends: suspend/suspend_advanced
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
@@ -1571,7 +1797,8 @@ _description:
 automatically selected result.
 
 plugin: shell
-name: mediacard/cf-storage-after-suspend
+id: mediacard/cf-storage-after-suspend
+estimated_duration: 10.0
 depends: mediacard/cf-insert-after-suspend
 user: root
 command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
@@ -1580,7 +1807,8 @@ _description:
 is run. It tests reading and writing to the CF card after the system has been suspended.
 
 plugin: user-interact
-name: mediacard/cf-remove-after-suspend
+id: mediacard/cf-remove-after-suspend
+estimated_duration: 30.0
 depends: mediacard/cf-insert-after-suspend
 command: removable_storage_watcher --memorycard remove sdio usb scsi
 _description:
@@ -1596,7 +1824,8 @@ _description:
 
 
 plugin: user-interact
-name: mediacard/sdxc-insert-after-suspend
+id: mediacard/sdxc-insert-after-suspend
+estimated_duration: 30.0
 depends: suspend/suspend_advanced
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
@@ -1613,7 +1842,8 @@ _description:
 automatically selected result.
 
 plugin: shell
-name: mediacard/sdxc-storage-after-suspend
+id: mediacard/sdxc-storage-after-suspend
+estimated_duration: 10.0
 depends: mediacard/sdxc-insert-after-suspend
 user: root
 command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
@@ -1622,8 +1852,9 @@ _description:
 is run. It tests reading and writing to the SDXC card after the system has been suspended.
 
 plugin: user-interact
-name: mediacard/sdxc-remove-after-suspend
+id: mediacard/sdxc-remove-after-suspend
 depends: mediacard/sdxc-insert-after-suspend
+estimated_duration: 30.0
 command: removable_storage_watcher --memorycard remove sdio usb scsi
 _description:
 PURPOSE:
@@ -1638,7 +1869,8 @@ _description:
 automatically selected result.
 
 plugin: user-interact
-name: mediacard/ms-insert-after-suspend
+id: mediacard/ms-insert-after-suspend
+estimated_duration: 30.0
 depends: suspend/suspend_advanced
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
@@ -1655,7 +1887,8 @@ _description:
 automatically selected result.
 
 plugin: shell
-name: mediacard/ms-storage-after-suspend
+id: mediacard/ms-storage-after-suspend
+estimated_duration: 10.0
 depends: mediacard/ms-insert-after-suspend
 user: root
 command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
@@ -1664,7 +1897,8 @@ _description:
 is run. It tests reading and writing to the MS card after the system has been suspended.
 
 plugin: user-interact
-name: mediacard/ms-remove-after-suspend
+id: mediacard/ms-remove-after-suspend
+estimated_duration: 30.0
 depends: mediacard/ms-insert-after-suspend
 command: removable_storage_watcher --memorycard remove sdio usb scsi
 _description:
@@ -1679,7 +1913,8 @@ _description:
 automatically selected result.
 
 plugin: user-interact
-name: mediacard/msp-insert-after-suspend
+id: mediacard/msp-insert-after-suspend
+estimated_duration: 30.0
 depends: suspend/suspend_advanced
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
@@ -1696,7 +1931,8 @@ _description:
 automatically selected result.
 
 plugin: shell
-name: mediacard/msp-storage-after-suspend
+id: mediacard/msp-storage-after-suspend
+estimated_duration: 10.0
 depends: mediacard/msp-insert-after-suspend
 user: root
 command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
@@ -1705,7 +1941,8 @@ _description:
 is run. It tests reading and writing to the MSP card after the system has been suspended.
 
 plugin: user-interact
-name: mediacard/msp-remove-after-suspend
+id: mediacard/msp-remove-after-suspend
+estimated_duration: 30.0
 depends: mediacard/msp-insert-after-suspend
 command: removable_storage_watcher --memorycard remove sdio usb scsi
 _description:
@@ -1720,7 +1957,8 @@ _description:
 automatically selected result.
 
 plugin: user-interact
-name: mediacard/xd-insert-after-suspend
+id: mediacard/xd-insert-after-suspend
+estimated_duration: 30.0
 depends: suspend/suspend_advanced
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
@@ -1737,7 +1975,8 @@ _description:
 automatically selected result.
 
 plugin: shell
-name: mediacard/xd-storage-after-suspend
+id: mediacard/xd-storage-after-suspend
+estimated_duration: 10.0
 depends: mediacard/xd-insert-after-suspend
 user: root
 command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
@@ -1746,7 +1985,8 @@ _description:
 is run. It tests reading and writing to the xD card after the system has been suspended.
 
 plugin: user-interact
-name: mediacard/xd-remove-after-suspend
+id: mediacard/xd-remove-after-suspend
+estimated_duration: 30.0
 depends: mediacard/xd-insert-after-suspend
 command: removable_storage_watcher --memorycard remove sdio usb scsi
 _description:
@@ -1761,7 +2001,7 @@ _description:
 automatically selected result.
 
 plugin: shell
-name: touchpad/touchpad_after_suspend
+id: touchpad/touchpad_after_suspend
 depends: suspend/suspend_advanced_auto
 requires:
 dmi.product in ['Notebook','Laptop','Portable']
@@ -1772,9 +2012,9 @@ _description:
 Determine if the touchpad is still functioning after suspend/resume.
 
 plugin: manual
-name: touchscreen/touchscreen_after_suspend
+id: touchscreen/touchscreen_after_suspend
 depends: suspend/suspend_advanced_auto
-estimated_duration: 120.0
+estimated_duration: 30.0
 _description:
 PURPOSE:
 Check touchscreen tap recognition
diff --git a/provider_jobs/touchpad.txt.in b/jobs/touchpad.txt.in
index 1b5f64a..432d69e 100644
--- a/provider_jobs/touchpad.txt.in
+++ b/jobs/touchpad.txt.in
@@ -1,5 +1,5 @@
 plugin: manual
-name: touchpad/basic
+id: touchpad/basic
 requires: dmi.product in ['Notebook','Laptop','Portable']
 estimated_duration: 120.0
 _description:
@@ -12,8 +12,9 @@ _description:
 Did the cursor move?
 
 plugin: user-interact
-name: touchpad/horizontal
+id: touchpad/horizontal
 requires:
+ dmi.product in ['Notebook','Laptop','Portable']
 'Button Horiz Wheel Left' in xinput.button_labels and 'Button Horiz Wheel Right' in xinput.button_labels
 command: touchpad_test right left --edge-scroll
 estimated_duration: 120.0
@@ -27,8 +28,9 @@ _description:
 Could you scroll right and left?
 
 plugin: user-interact
-name: touchpad/vertical
+id: touchpad/vertical
 requires:
+ dmi.product in ['Notebook','Laptop','Portable']
 'Button Wheel Up' in xinput.button_labels and 'Button Wheel Down' in xinput.button_labels
 command: touchpad_test up down --edge-scroll
 estimated_duration: 120.0
@@ -42,7 +44,7 @@ _description:
 Could you scroll up and down?
 
 plugin: shell
-name: touchpad/singletouch-automated
+id: touchpad/singletouch-automated
 requires:
 dmi.product in ['Notebook','Laptop','Portable']
 xinput.device_class == 'XITouchClass' and xinput.touch_mode != 'dependent'
@@ -52,7 +54,8 @@ _description:
 Determine whether the touchpad is detected as a singletouch device automatically.
 
 plugin: shell
-name: touchpad/multitouch-automated
+id: touchpad/multitouch-automated
+estimated_duration: 1.2
 requires:
 dmi.product in ['Notebook','Laptop','Portable']
 xinput.device_class == 'XITouchClass' and xinput.touch_mode == 'dependent'
@@ -61,7 +64,7 @@ _description:
 Determine whether the touchpad is detected as a multitouch device automatically.
 
 plugin: manual
-name: touchpad/multitouch-manual
+id: touchpad/multitouch-manual
 depends: touchpad/singletouch-automated
 estimated_duration: 120.0
 _description:
@@ -73,7 +76,7 @@ _description:
 Is the touchpad supposed to be multitouch?
 
 plugin: manual
-name: touchpad/singletouch-corner
+id: touchpad/singletouch-corner
 estimated_duration: 120.0
 _description:
 PURPOSE:
@@ -86,7 +89,7 @@ _description:
 Did the tap trigger a new tab to be opended?
 
 plugin: manual
-name: touchpad/singletouch-selection
+id: touchpad/singletouch-selection
 estimated_duration: 120.0
 _description:
 PURPOSE:
@@ -98,7 +101,7 @@ _description:
 Did a selection window open and were several files selected?
 
 plugin: manual
-name: touchpad/multitouch-rightclick
+id: touchpad/multitouch-rightclick
 depends: touchpad/multitouch-automated
 estimated_duration: 120.0
 _description:
@@ -112,7 +115,7 @@ _description:
 Did the right click pop up menu appear?
 
 plugin: user-interact
-name: touchpad/multitouch-horizontal
+id: touchpad/multitouch-horizontal
 command: touchpad_test right left
 estimated_duration: 120.0
 _description:
@@ -125,7 +128,7 @@ _description:
 Could you scroll right and left?
 
 plugin: user-interact
-name: touchpad/multitouch-vertical
+id: touchpad/multitouch-vertical
 command: touchpad_test up down
 estimated_duration: 120.0
 _description:
@@ -138,7 +141,7 @@ _description:
 Could you scroll up and down?
 
 plugin: manual
-name: touchpad/drag-and-drop
+id: touchpad/drag-and-drop
 estimated_duration: 120.0
 _description:
 PURPOSE:
diff --git a/provider_jobs/touchscreen.txt.in b/jobs/touchscreen.txt.in
index 0feb6d4..4a888de 100644
--- a/provider_jobs/touchscreen.txt.in
+++ b/jobs/touchscreen.txt.in
@@ -1,5 +1,5 @@
 plugin: shell
-name: touchscreen/nontouch-automated
+id: touchscreen/nontouch-automated
 requires:
 xinput.device_class == 'XITouchClass' and xinput.touch_mode != 'direct'
 command: true
@@ -8,7 +8,7 @@ _description:
 Determine whether the screen is detected as a non-touch device automatically.
 
 plugin: shell
-name: touchscreen/multitouch-automated
+id: touchscreen/multitouch-automated
 requires:
 xinput.device_class == 'XITouchClass' and xinput.touch_mode == 'direct'
 command: true
@@ -17,7 +17,7 @@ _description:
 Determine whether the screen is detected as a multitouch device automatically.
 
 plugin: manual
-name: touchscreen/multitouch-manual
+id: touchscreen/multitouch-manual
 depends: touchscreen/nontouch-automated
 estimated_duration: 120.0
 _description:
@@ -29,7 +29,7 @@ _description:
 Is the screen supposed to be multitouch?
 
 plugin: manual
-name: touchscreen/tap-detect
+id: touchscreen/tap-detect
 depends: touchscreen/multitouch-automated
 estimated_duration: 120.0
 _description:
@@ -41,7 +41,7 @@ _description:
 Does tap recognition work?
 
 plugin: manual
-name: touchscreen/drag-n-drop
+id: touchscreen/drag-n-drop
 depends: touchscreen/multitouch-automated
 estimated_duration: 120.0
 _description:
@@ -54,7 +54,7 @@ _description:
 Does the object select and drag and drop?
 
 plugin: manual
-name: touchscreen/multitouch-zoom
+id: touchscreen/multitouch-zoom
 depends: touchscreen/multitouch-automated
 estimated_duration: 120.0
 _description:
@@ -67,7 +67,7 @@ _description:
 Does the screen zoom in and out?
 
 plugin: manual
-name: touchscreen/multitouch-window-move
+id: touchscreen/multitouch-window-move
 depends: touchscreen/multitouch-automated
 estimated_duration: 120.0
 _description:
@@ -80,7 +80,7 @@ _description:
 Did the window move along with the drag?
 
 plugin: manual
-name: touchscreen/multitouch-dash
+id: touchscreen/multitouch-dash
 depends: touchscreen/multitouch-automated
 estimated_duration: 120.0
 _description:
diff --git a/provider_jobs/usb.txt.in b/jobs/usb.txt.in
index 384991d..d159c39 100644
--- a/provider_jobs/usb.txt.in
+++ b/jobs/usb.txt.in
@@ -1,11 +1,13 @@
 plugin: shell
-name: usb/detect
+id: usb/detect
+estimated_duration: 1.0
 command: lsusb | sed 's/.*\(ID .*\)/\1/' | head -n 4 || echo "No USB devices were detected" >&2
 _description: Detects and shows USB devices attached to this system.
 
 plugin: user-interact-verify
-name: usb/disk_detect
+id: usb/disk_detect
 depends: usb/detect
+estimated_duration: 1.0
 command: removable_storage_test -l usb
 _description:
 PURPOSE:
@@ -19,8 +21,9 @@ _description:
 Were the drives detected?
 
 plugin: user-interact-verify
-name: usb/HID
+id: usb/HID
 depends: usb/detect
+estimated_duration: 1.0
 command: keyboard_test
 _description:
 PURPOSE:
@@ -33,41 +36,48 @@ _description:
 Did the device work as expected?
 
 plugin: user-interact
-name: usb/insert
+id: usb/insert
 depends: usb/detect
+estimated_duration: 10.0
 command: removable_storage_watcher insert usb
 _description:
 PURPOSE:
 This test will check that the system correctly detects the insertion of
 a USB storage device
 STEPS:
- 1. Click "Test" and insert a USB storage device (pen-drive/HDD).
- (Note: this test will time-out after 20 seconds.)
+ 1. Click "Test" and insert a USB storage device, preferably a HDD.
+ Although a USB pen drive may be used it might cause performance
+ related tests to fail. (Note: this test will time-out after 20
+ seconds.)
 2. Do not unplug the device after the test.
 VERIFICATION:
 The verification of this test is automated. Do not change the
 automatically selected result.
 
 plugin: user-interact
-name: usb3/insert
+id: usb3/insert
 requires:
 usb.usb3 == 'supported'
+estimated_duration: 10.0
 command: removable_storage_watcher -m 500000000 insert usb
 _description:
 PURPOSE:
 This test will check that the system correctly detects the insertion of
 a USB 3.0 storage device
 STEPS:
- 1. Click "Test" and insert a USB 3.0 storage device (pen-drive/HDD) in
- a USB 3.0 port. (Note: this test will time-out after 20 seconds.)
+ 1. Click "Test" and insert a USB 3.0 storage device, preferably a HDD,
+ in a USB 3.0 port. Although a USB 3.0 pen drive may be used it might
+ cause performance related tests to fail. (Note: this test will 
+ time-out after 20 seconds.)
 2. Do not unplug the device after the test.
 VERIFICATION:
 The verification of this test is automated. Do not change the
 automatically selected result.
 
 plugin: user-interact
-name: usb/remove
+id: usb/remove
 depends: usb/insert
+estimated_duration: 10.0
 command: removable_storage_watcher remove usb
 _description:
 PURPOSE:
@@ -81,10 +91,11 @@ _description:
 automatically selected result.
 
 plugin: user-interact
-name: usb3/remove
+id: usb3/remove
 depends: usb3/insert
 requires:
 usb.usb3 == 'supported'
+estimated_duration: 10.0
 command: removable_storage_watcher -m 500000000 remove usb
 _description:
 PURPOSE:
@@ -98,9 +109,10 @@ _description:
 automatically selected result.
 
 plugin: user-interact-verify
-name: usb/storage-transfer
+id: usb/storage-transfer
 depends: usb/insert
 user: root
+estimated_duration: 45.0
 command: removable_storage_test -s 268400000 usb
 _description:
 PURPOSE:
@@ -114,12 +126,13 @@ _description:
 automatically selected result.
 
 plugin: user-interact-verify
-name: usb3/storage-transfer
+id: usb3/storage-transfer
 requires:
 usb.usb3 == 'supported'
 depends: usb3/insert
 user: root
-command: removable_storage_test -s 268400000 -m 500000000 -p 7 usb
+estimated_duration: 45.0
+command: removable_storage_test -s 268400000 -m 500000000 usb
 _description:
 PURPOSE:
 This test will check your USB 3.0 connection.
@@ -132,26 +145,29 @@ _description:
 automatically selected result.
 
 plugin: shell
-name: usb/storage-automated
+id: usb/storage-automated
 depends: usb/insert
 user: root
+estimated_duration: 45.0
 command: removable_storage_test -s 268400000 usb
 _description:
 This test is automated and executes after the usb/insert test is run.
 
 plugin: shell
-name: usb3/storage-automated
+id: usb3/storage-automated
 requires:
 usb.usb3 == 'supported'
 depends: usb3/insert
 user: root
+estimated_duration: 45.0
 command: removable_storage_test -s 268400000 -m 500000000 -p 7 usb
 _description:
 This test is automated and executes after the usb3/insert test is run.
 
 plugin: shell
-name: usb/storage-preinserted
+id: usb/storage-preinserted
 user: root
+estimated_duration: 45.0
 command: removable_storage_test -l usb && removable_storage_test -s 268400000 usb
 _description:
 This is an automated version of usb/storage-automated and assumes that the
@@ -159,10 +175,11 @@ _description:
 is intended for servers and SRU automated testing.
 
 plugin: shell
-name: usb3/storage-preinserted
+id: usb3/storage-preinserted
 user: root
 requires:
 usb.usb3 == 'supported'
+estimated_duration: 45.0
 command: removable_storage_test -l usb && removable_storage_test -s 268400000 -m 500000000 -p 7 usb
 _description:
 This is an automated version of usb3/storage-automated and assumes that the
@@ -170,7 +187,7 @@ _description:
 is intended for servers and SRU automated testing.
 
 plugin: manual
-name: usb/panels
+id: usb/panels
 _description:
 PURPOSE:
 This test will check your USB connection.
@@ -183,19 +200,25 @@ _description:
 VERIFICATION:
 Do all USB slots work with the device?
 
-plugin: local
-name: usb/usb3_read_performance
+plugin: shell
+id: usb/performance
+depends: usb/insert
+user: root
+estimated_duration: 45.00
+command: removable_storage_test -s 268400000 -p 15 usb
+_description:
+ This test will check that your USB 2.0 port transfers data at a
+ minimum expected speed.
+
+plugin: shell
+id: usb3/superspeed_performance
 requires:
- device.category == 'DISK'
-_description: Verify USB3 external storage performs at or above baseline performance
-command:
- cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=DISK"'
- plugin: shell
- name: usb/usb3_read_performance_`ls /sys$path/block`
- requires:
- device.path == "$path"
- block_device.`ls /sys$path/block`_state == 'removable' and block_device.`ls /sys$path/block`_usb3 == 'supported'
- description: USB3 read performance test for $product
- user: root
- command: disk_read_performance_test `ls /sys$path/block | sed 's|!|/|'`
- EOF
+ usb.usb3 == 'supported'
+depends: usb3/insert
+user: root
+estimated_duration: 45.00
+command: removable_storage_test -s 268400000 -m 500000000 -p 60 usb
+_description:
+ This test will check that your USB 3.0 port transfers data at a
+ minimum expected speed in accordance with the specification of
+ USB 3.0 SuperSpeed mode.
diff --git a/provider_jobs/user_apps.txt.in b/jobs/user_apps.txt.in
index 2b16562..0907109 100644
--- a/provider_jobs/user_apps.txt.in
+++ b/jobs/user_apps.txt.in
@@ -1,5 +1,5 @@
 plugin: user-interact-verify
-name: software/update_manager_finds_updates
+id: software/update_manager_finds_updates
 depends: ethernet/detect
 user: root
 requires: package.name == 'update-manager'
@@ -16,7 +16,7 @@ _description:
 command: update-manager --check-dist-upgrades
 
 plugin: user-interact-verify
-name: software/nautilus_folder_create
+id: software/nautilus_folder_create
 requires: package.name == 'nautilus'
 command: nautilus
 _description:
@@ -31,7 +31,7 @@ _description:
 Do you now have a new folder called Test Folder?
 
 plugin: user-interact-verify
-name: software/nautilus_folder_copy
+id: software/nautilus_folder_copy
 depends: software/nautilus_folder_create
 command: nautilus
 _description:
@@ -48,7 +48,7 @@ _description:
 Do you now have a folder called Test Data?
 
 plugin: user-interact-verify
-name: software/nautilus_folder_move
+id: software/nautilus_folder_move
 depends: software/nautilus_folder_copy
 command: nautilus
 _description:
@@ -64,7 +64,7 @@ _description:
 Was the folder called Test Data successfully moved into the folder called Test Folder?
 
 plugin: user-interact-verify
-name: software/nautilus_file_create
+id: software/nautilus_file_create
 depends: software/nautilus_folder_create
 command: nautilus $HOME/"Test Folder"
 _description:
@@ -79,7 +79,7 @@ _description:
 Do you now have a file called Test File 1?
 
 plugin: user-interact-verify
-name: software/nautilus_file_copy
+id: software/nautilus_file_copy
 depends: software/nautilus_file_create
 command: nautilus $HOME/"Test Folder"
 _description:
@@ -96,7 +96,7 @@ _description:
 Do you now have a file called Test File 2?
 
 plugin: user-interact-verify
-name: software/nautilus_file_move
+id: software/nautilus_file_move
 depends: software/nautilus_file_copy
 command: nautilus $HOME/"Test Folder"
 _description:
@@ -112,7 +112,7 @@ _description:
 Was the file Test File 2 successfully moved into the Test Data folder?
 
 plugin: user-interact-verify
-name: software/nautilus_file_delete
+id: software/nautilus_file_delete
 depends: software/nautilus_file_create
 command: nautilus $HOME/"Test Folder"
 _description:
@@ -127,7 +127,7 @@ _description:
 Is Test File 1 now gone?
 
 plugin: user-interact-verify
-name: software/nautilus_folder_delete
+id: software/nautilus_folder_delete
 depends: software/nautilus_folder_create
 command: nautilus
 _description:
@@ -142,12 +142,12 @@ _description:
 Has Test Folder been successfully deleted?
 
 plugin: local
-name: software/view_office_document
+id: software/view_office_document
 requires: package.name == "ubuntu-desktop"
 _description: Common Document Types Test
 command:
- cat <<'EOF' | run_templates -s "find $CHECKBOX_SHARE/data/documents -type f"
- name: `basename $0`_test
+ cat <<'EOF' | run_templates -s "find $PLAINBOX_PROVIDER_DATA/documents -type f"
+ id: `basename $0`_test
 plugin: user-interact-verify
 description:
 PURPOSE:
@@ -162,12 +162,12 @@ command:
 EOF
 
 plugin: local
-name: software/audio_file_play
+id: software/audio_file_play
 requires: package.name == "ubuntu-desktop"
 _description: Common Document Types Test
 command:
- cat <<'EOF' | run_templates -s "find $CHECKBOX_SHARE/data/audio -type f"
- name: `basename $0`_test
+ cat <<'EOF' | run_templates -s "find $PLAINBOX_PROVIDER_DATA/audio -type f"
+ id: `basename $0`_test
 plugin: user-interact-verify
 description:
 PURPOSE:
@@ -182,12 +182,12 @@ command:
 EOF
 
 plugin: local
-name: software/video_file_play
+id: software/video_file_play
 requires: package.name == "ubuntu-desktop"
 _description: Common Document Types Test
 command:
- cat <<'EOF' | run_templates -s "find $CHECKBOX_SHARE/data/video -type f"
- name: `basename $0`_test
+ cat <<'EOF' | run_templates -s "find $PLAINBOX_PROVIDER_DATA/video -type f"
+ id: `basename $0`_test
 plugin: user-interact-verify
 description:
 PURPOSE:
@@ -202,12 +202,12 @@ command:
 EOF
 
 plugin: local
-name: software/view_image_file
+id: software/view_image_file
 requires: package.name == "ubuntu-desktop"
 _description: Common Document Types Test
 command:
- cat <<'EOF' | run_templates -s "find $CHECKBOX_SHARE/data/images -type f"
- name: `basename $0`_test
+ cat <<'EOF' | run_templates -s "find $PLAINBOX_PROVIDER_DATA/images -type f"
+ id: `basename $0`_test
 plugin: user-interact-verify
 description:
 PURPOSE:
@@ -222,9 +222,9 @@ command:
 EOF
 
 plugin: user-interact-verify
-name: software/firefox
+id: software/firefox
 requires: package.name == 'firefox'
-command: firefox $CHECKBOX_SHARE/data/websites/testindex.html
+command: firefox $PLAINBOX_PROVIDER_DATA/websites/testindex.html
 _description:
 PURPOSE:
 This test will check that Firefox can render a basic web page.
@@ -234,10 +234,10 @@ _description:
 Did the Ubuntu Test page load correctly?
 
 plugin: user-interact-verify
-name: software/firefox-flash
+id: software/firefox-flash
 depends: software/firefox
 requires: package.name == 'firefox'
-command: firefox $CHECKBOX_SHARE/data/websites/flashtest.html
+command: firefox $PLAINBOX_PROVIDER_DATA/websites/flashtest.html
 _description:
 PURPOSE:
 This test will check that Firefox can run flash applications. Note: this may
@@ -248,10 +248,10 @@ _description:
 Did you see the text?
 
 plugin: user-interact-verify
-name: software/firefox-flash-video
+id: software/firefox-flash-video
 depends: software/firefox-flash
 requires: package.name == 'firefox'
-command: firefox $CHECKBOX_SHARE/data/websites/flashvideo.html
+command: firefox $PLAINBOX_PROVIDER_DATA/websites/flashvideo.html
 _description:
 PURPOSE:
 This test will check that Firefox can play a Flash video. Note: this may
@@ -262,12 +262,12 @@ _description:
 Did the video play correctly?
 
 plugin: user-interact-verify
-name: software/firefox-totem
+id: software/firefox-totem
 depends: software/firefox
 requires:
 package.name == 'firefox'
 package.name == 'gstreamer0.10-ffmpeg'
-command: firefox $CHECKBOX_SHARE/data/video/Quicktime_Video.mov
+command: firefox $PLAINBOX_PROVIDER_DATA/video/Quicktime_Video.mov
 _description:
 PURPOSE:
 This test will check that Firefox can play a Quicktime (.mov) video file.
@@ -279,7 +279,7 @@ _description:
 Did the video play using a plugin?
 
 plugin: user-interact-verify
-name: software/empathy-facebook_chat
+id: software/empathy-facebook_chat
 requires: package.name == "empathy"
 command: empathy
 _description:
@@ -293,7 +293,7 @@ _description:
 Were you able to connect correctly and send/receive messages?
 
 plugin: user-interact-verify
-name: software/empathy-google_talk
+id: software/empathy-google_talk
 requires: package.name == "empathy"
 command: empathy
 _description:
@@ -307,7 +307,7 @@ _description:
 Were you able to connect correctly and send/receive messages?
 
 plugin: user-interact-verify
-name: software/empathy-jabber
+id: software/empathy-jabber
 requires: package.name == "empathy"
 command: empathy
 _description:
@@ -321,7 +321,7 @@ _description:
 Were you able to connect correctly and send/receive messages?
 
 plugin: user-interact-verify
-name: software/empathy-aim
+id: software/empathy-aim
 requires: package.name == "empathy"
 command: empathy
 _description:
@@ -335,7 +335,7 @@ _description:
 Were you able to connect correctly and send/receive messages?
 
 plugin: user-interact-verify
-name: software/empathy-msn
+id: software/empathy-msn
 requires: package.name == "empathy"
 command: empathy
 _description:
@@ -349,7 +349,7 @@ _description:
 Were you able to connect correctly and send/receive messages?
 
 plugin: user-interact-verify
-name: software/evolution-pop3
+id: software/evolution-pop3
 requires: package.name == "evolution"
 command: evolution
 _description:
@@ -362,7 +362,7 @@ _description:
 Were you able to receive and read e-mail correctly?
 
 plugin: user-interact-verify
-name: software/evolution-imap
+id: software/evolution-imap
 requires: package.name == "evolution"
 command: evolution
 _description:
@@ -375,7 +375,7 @@ _description:
 Were you able to receive and read e-mail correctly?
 
 plugin: user-interact-verify
-name: software/evolution-smtp
+id: software/evolution-smtp
 requires: package.name == "evolution"
 command: evolution
 _description:
@@ -388,7 +388,7 @@ _description:
 Were you able to send e-mail without errors?
 
 plugin: user-interact-verify
-name: software/gcalctool
+id: software/gcalctool
 requires: package.name == "gcalctool"
 command: gcalctool
 _description:
@@ -400,7 +400,7 @@ _description:
 Did it launch correctly?
 
 plugin: user-interact-verify
-name: software/gcalctool-functions
+id: software/gcalctool-functions
 depends: software/gcalctool
 requires: package.name == "gcalctool"
 command: gcalctool
@@ -417,7 +417,7 @@ _description:
 Did the functions perform as expected?
 
 plugin: user-interact-verify
-name: software/gcalctool-memory
+id: software/gcalctool-memory
 depends: software/gcalctool
 requires: package.name == "gcalctool"
 command: gcalctool
@@ -434,7 +434,7 @@ _description:
 Did the functions perform as expected?
 
 plugin: user-interact-verify
-name: software/gcalctool-clipboard
+id: software/gcalctool-clipboard
 depends: software/gcalctool
 requires: package.name == "gcalctool"
 command: gcalctool
@@ -450,7 +450,7 @@ _description:
 Did the functions perform as expected?
 
 plugin: user-interact-verify
-name: software/gedit
+id: software/gedit
 requires: package.name == "gedit"
 command: gedit
 _description:
@@ -463,7 +463,7 @@ _description:
 Did this perform as expected?
 
 plugin: user-interact-verify
-name: software/gedit-read
+id: software/gedit-read
 depends: software/gedit
 requires: package.name == "gedit"
 command: gedit
@@ -477,7 +477,7 @@ _description:
 Did this perform as expected?
 
 plugin: user-interact-verify
-name: software/gnome-terminal
+id: software/gnome-terminal
 requires: package.name == "gnome-terminal"
 command: gnome-terminal
 _description:
diff --git a/provider_jobs/virtualization.txt.in b/jobs/virtualization.txt.in
index 9e19ab1..7f4b880 100644
--- a/provider_jobs/virtualization.txt.in
+++ b/jobs/virtualization.txt.in
@@ -1,5 +1,5 @@
 plugin: shell
-name: virtualization/kvm_check_vm
+id: virtualization/kvm_check_vm
 user: root
 environ: http_proxy https_proxy
 requires:
@@ -11,7 +11,7 @@ _description:
 Test to check that a cloud image boots and works properly with KVM
 
 plugin: shell
-name: virtualization/xen_ok
+id: virtualization/xen_ok
 requires: package.name == 'libvirt-bin'
 user: root
 command: virsh -c xen:/// domstate Domain-0
@@ -19,7 +19,7 @@ _description:
 Test to verify that the Xen Hypervisor is running.
 
 plugin: shell
-name: virtualization/xen_check_vm
+id: virtualization/xen_check_vm
 depends: virtualization/xen_ok
 user: root
 command: xen_test /images/xentest.img /images/xentest.xml
diff --git a/provider_jobs/wireless.txt.in b/jobs/wireless.txt.in
index 5e25b3a..782cd24 100644
--- a/provider_jobs/wireless.txt.in
+++ b/jobs/wireless.txt.in
@@ -1,5 +1,5 @@
 plugin: shell
-name: wireless/wireless_scanning
+id: wireless/wireless_scanning
 requires:
 package.name == 'network-manager'
 device.category == 'WIRELESS'
@@ -21,7 +21,7 @@ estimated_duration: 0.645
 _description: Wireless scanning test. It scans and reports on discovered APs.
 
 plugin: shell
-name: wireless/info_automated
+id: wireless/info_automated
 requires:
 package.name == 'network-manager'
 device.category == 'WIRELESS'
@@ -31,7 +31,7 @@ _description:
 This is an automated test to gather some info on the current state of your wireless devices. If no devices are found, the test will exit with an error.
 
 plugin: user-interact-verify
-name: wireless/wireless_connection
+id: wireless/wireless_connection
 command: network_check
 estimated_duration: 120.0
 requires: device.category == 'WIRELESS'
@@ -46,7 +46,7 @@ _description:
 Did a notification show and was the connection correctly established?
 
 plugin: shell
-name: wireless/wireless_connection_wpa_bg
+id: wireless/wireless_connection_wpa_bg
 requires:
 device.category == 'WIRELESS'
 environment.ROUTERS == 'multiple'
@@ -59,7 +59,7 @@ _description:
 security and the 802.11b/g protocols.
 
 plugin: shell
-name: wireless/wireless_connection_open_bg
+id: wireless/wireless_connection_open_bg
 requires:
 device.category == 'WIRELESS'
 environment.ROUTERS == 'multiple'
@@ -72,10 +72,11 @@ _description:
 security and the 802.11b/g protocols.
 
 plugin: shell
-name: wireless/wireless_connection_wpa_n
+id: wireless/wireless_connection_wpa_n
 requires:
 device.category == 'WIRELESS'
 environment.ROUTERS == 'multiple'
+ IEEE_80211.n == 'supported'
 user: root
 environ: WPA_N_SSID WPA_N_PSK
 command: trap "nmcli con delete id $WPA_N_SSID" EXIT; create_connection wifi $WPA_N_SSID --security=wpa --key=$WPA_N_PSK && gateway_ping_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
@@ -85,10 +86,11 @@ _description:
 security and the 802.11n protocol.
 
 plugin: shell
-name: wireless/wireless_connection_open_n
+id: wireless/wireless_connection_open_n
 requires:
 device.category == 'WIRELESS'
 environment.ROUTERS == 'multiple'
+ IEEE_80211.n == 'supported'
 user: root
 environ: OPEN_N_SSID
 command: trap "nmcli con delete id $OPEN_N_SSID" EXIT; create_connection wifi $OPEN_N_SSID && gateway_ping_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
@@ -97,8 +99,36 @@ _description:
 Tests that the systems wireless hardware can connect to a router using no
 security and the 802.11n protocol.
 
+plugin: shell
+id: wireless/wireless_connection_wpa_ac
+requires:
+ device.category == 'WIRELESS'
+ environment.ROUTERS == 'multiple'
+ IEEE_80211.ac == 'supported'
+user: root
+environ: WPA_AC_SSID WPA_AC_PSK
+command: trap "nmcli con delete id $WPA_AC_SSID" EXIT; create_connection wifi $WPA_AC_SSID --security=wpa --key=$WPA_AC_PSK && gateway_ping_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+estimated_duration: 30.0
+_description:
+ Tests that the systems wireless hardware can connect to a router using WPA
+ security and the 802.11ac protocol.
+
+plugin: shell
+id: wireless/wireless_connection_open_ac
+requires:
+ device.category == 'WIRELESS'
+ environment.ROUTERS == 'multiple'
+ IEEE_80211.ac == 'supported'
+user: root
+environ: OPEN_AC_SSID
+command: trap "nmcli con delete id $OPEN_AC_SSID" EXIT; create_connection wifi $OPEN_AC_SSID && gateway_ping_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+estimated_duration: 30.0
+_description:
+ Tests that the systems wireless hardware can connect to a router using no
+ security and the 802.11ac protocol.
+
 plugin: user-interact-verify
-name: wireless/wireless_connection_wpa_bg_manual
+id: wireless/wireless_connection_wpa_bg_manual
 requires:
 device.category == 'WIRELESS'
 environment.ROUTERS == 'single'
@@ -120,7 +150,7 @@ _description:
 Verification is automated, do not change the automatically selected result.
 
 plugin: user-interact-verify
-name: wireless/wireless_connection_open_bg_manual
+id: wireless/wireless_connection_open_bg_manual
 requires:
 device.category == 'WIRELESS'
 environment.ROUTERS == 'single'
@@ -142,10 +172,12 @@ _description:
 Verification is automated, do not change the automatically selected result.
 
 plugin: user-interact-verify
-name: wireless/wireless_connection_wpa_n_manual
+id: wireless/wireless_connection_wpa_n_manual
 requires:
 device.category == 'WIRELESS'
 environment.ROUTERS == 'single'
+ IEEE_80211.n == 'supported'
+ IEEE_80211.band_5GHz == 'supported'
 user: root
 environ: ROUTER_SSID ROUTER_PSK
 command: trap "nmcli con delete id $ROUTER_SSID" EXIT; create_connection wifi $ROUTER_SSID --security=wpa --key=$ROUTER_PSK && gateway_ping_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
@@ -164,10 +196,12 @@ _description:
 Verification is automated, do not change the automatically selected result.
 
 plugin: user-interact-verify
-name: wireless/wireless_connection_open_n_manual
+id: wireless/wireless_connection_open_n_manual
 requires:
 device.category == 'WIRELESS'
 environment.ROUTERS == 'single'
+ IEEE_80211.n == 'supported'
+ IEEE_80211.band_5GHz == 'supported'
 user: root
 environ: ROUTER_SSID
 command: trap "nmcli con delete id $ROUTER_SSID" EXIT; create_connection wifi $ROUTER_SSID && gateway_ping_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
@@ -185,8 +219,54 @@ _description:
 VERIFICATION:
 Verification is automated, do not change the automatically selected result.
 
+plugin: user-interact-verify
+id: wireless/wireless_connection_wpa_ac_manual
+requires:
+ device.category == 'WIRELESS'
+ environment.ROUTERS == 'single'
+ IEEE_80211.ac == 'supported'
+user: root
+environ: ROUTER_SSID ROUTER_PSK
+command: trap "nmcli con delete id $ROUTER_SSID" EXIT; create_connection wifi $ROUTER_SSID --security=wpa --key=$ROUTER_PSK && gateway_ping_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+estimated_duration: 120.0
+_description:
+ PURPOSE:
+ Tests that the systems wireless hardware can connect to a router using WPA
+ security and the 802.11ac protocol.
+ STEPS:
+ 1. Open your router's configuration tool
+ 2. Change the settings to only accept connections with the 802.11ac protocol.
+ 3. Make sure the SSID is set to ROUTER_SSID
+ 4. Change the security settings to use WPA2 and ensure the PSK matches that set in ROUTER_PSK
+ 5. Click the 'Test' button to create a connection to the router and test the connection
+ VERIFICATION:
+ Verification is automated, do not change the automatically selected result.
+
+plugin: user-interact-verify
+id: wireless/wireless_connection_open_ac_manual
+requires:
+ device.category == 'WIRELESS'
+ environment.ROUTERS == 'single'
+ IEEE_80211.ac == 'supported'
+user: root
+environ: ROUTER_SSID
+command: trap "nmcli con delete id $ROUTER_SSID" EXIT; create_connection wifi $ROUTER_SSID && gateway_ping_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
+estimated_duration: 120.0
+_description:
+ PURPOSE:
+ Tests that the systems wireless hardware can connect to a router using
+ no security and the 802.11ac protocol.
+ STEPS:
+ 1. Open your routers configuration tool
+ 2. Change the settings to only accept connections with the 802.11ac protocol.
+ 3. Make sure the SSID is set to ROUTER_SSID
+ 4. Change the security settings to use no security
+ 5. Click the 'Test' button to create a connection to the router and test the connection
+ VERIFICATION:
+ Verification is automated, do not change the automatically selected result.
+
 plugin: shell
-name: wireless/monitor_wireless_connection
+id: wireless/monitor_wireless_connection
 requires:
 package.name == 'iperf'
 device.category == 'WIRELESS'
@@ -198,7 +278,7 @@ _description:
 Tests the performance of a systems wireless connection through the iperf tool.
 
 plugin: shell
-name: wireless/monitor_wireless_connection_udp
+id: wireless/monitor_wireless_connection_udp
 requires:
 package.name == 'iperf'
 device.category == 'WIRELESS'
@@ -210,8 +290,10 @@ _description:
 Tests the performance of a systems wireless connection through the iperf tool, using UDP packets.
 
 plugin: shell
-name: wireless/wireless_connection_open_a
-requires: device.category == 'WIRELESS'
+id: wireless/wireless_connection_open_a
+requires:
+ device.category == 'WIRELESS'
+ IEEE_80211.band_5GHz == 'supported'
 user: root
 environ: OPEN_A_SSID
 command: trap "nmcli con delete id $OPEN_A_SSID" EXIT; create_connection wifi $OPEN_A_SSID && gateway_ping_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
@@ -222,8 +304,9 @@ _description:
 respond to requests on the 802.11a protocol.
 
 plugin: shell
-name: wireless/wireless_connection_open_b
-requires: device.category == 'WIRELESS'
+id: wireless/wireless_connection_open_b
+requires:
+ device.category == 'WIRELESS'
 user: root
 environ: OPEN_B_SSID
 command: trap "nmcli con delete id $OPEN_B_SSID" EXIT; create_connection wifi $OPEN_B_SSID && gateway_ping_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
@@ -234,14 +317,14 @@ _description:
 respond to requests on the 802.11b protocol.
 
 plugin: local
-name: wireless/stress_performance
+id: wireless/stress_performance
 requires:
 device.category == 'NETWORK'
 _description: Automated test that tests performance of each wireless network device under stress.
 command:
 cat <<'EOF' | run_templates -s 'udev_resource | filter_templates -w "category=WIRELESS" | awk "/path: / { print \$2 }" | xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do echo \$0 \$i; done"'
 plugin: shell
- name: wireless/stress_performance_$2
+ id: wireless/stress_performance_$2
 requires: device.path == "$1"
 user: root
 command: network test -i $2 -t stress
@@ -251,8 +334,9 @@ command:
 EOF
 
 plugin: shell
-name: wireless/wireless_connection_open_g
-requires: device.category == 'WIRELESS'
+id: wireless/wireless_connection_open_g
+requires:
+ device.category == 'WIRELESS'
 user: root
 environ: OPEN_G_SSID
 command: trap "nmcli con delete id $OPEN_G_SSID" EXIT; create_connection wifi $OPEN_G_SSID && gateway_ping_test --interface=`nmcli dev status | awk '/802-11-wireless/ {print $1}'`
@@ -263,7 +347,7 @@ _description:
 respond to requests on the 802.11g protocol.
 
 plugin: shell
-name: wireless/wireless_extension
+id: wireless/wireless_extension
 requires: device.category == 'WIRELESS'
 command: wireless_ext
 estimated_duration: 1.2
@@ -271,13 +355,13 @@ _description:
 Test that the MAC80211 modules are loaded and wireless extensions are working.
 
 plugin: local
-name: wireless/iwconfig_info
+id: wireless/iwconfig_info
 requires:
 device.category == 'WIRELESS'
 command: 
 cat <<'EOF' | run_templates -s 'udev_resource | filter_templates -w "category=WIRELESS" | awk "/path: / { print \$2 }" | xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do echo \$0 \$i; done"'
 plugin: shell
- name: wireless/iwconfig_check_$2
+ id: wireless/iwconfig_check_$2
 requires: device.path == "$1"
 command: iwconfig $2
 estimated_duration: 1.2
@@ -288,7 +372,7 @@ _description:
 This is an automated test to gather some info on the current state of your network devices. If no devices are found, the test will exit with an error.
 
 plugin: user-interact-verify
-name: wireless/wireless_rfkill
+id: wireless/wireless_rfkill
 command: rfkill list | zenity --text-info --title rfkill-Info
 estimated_duration: 120.0
 requires: device.category == 'WIRELESS'
@@ -303,7 +387,7 @@ _description:
 Did the hard or soft blocks show on in the dialog?
 
 plugin: local
-name: wireless/maximum_bandwidth
+id: wireless/maximum_bandwidth
 requires:
 device.category == 'WIRELESS'
 package.name == 'zenity'
@@ -312,7 +396,7 @@ command:
 cat <<'EOF' | run_templates -s 'udev_resource | filter_templates -w "category=WIRELESS" | awk "/path: / { print \$2 }" | xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do echo \$0 \$i; done"'
 plugin: user-verify
 user: root
- name: wireless/maximum_bandwidth_$2
+ id: wireless/maximum_bandwidth_$2
 requires: device.path == "$1"
 command: network test -i $2 -t iperf 2>&1 | cat - <(echo; echo "Verify the result and click OK to decide on the outcome") | zenity --text-info --title 'wireless max bw $2'
 estimated_duration: 120.0
diff --git a/manage.py b/manage.py
new file mode 100755
index 0000000..1aaf668
--- /dev/null
+++ b/manage.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python3
+from plainbox.provider_manager import setup
+from plainbox.provider_manager import N_
+
+setup(
+ name='2013.com.canonical.certification:checkbox',
+ version="0.4",
+ description=N_("Checkbox provider"),
+ gettext_domain='2013.com.canonical.certification.checkbox',
+)
diff --git a/po/POTFILES.in b/po/POTFILES.in
new file mode 100644
index 0000000..1845c2d
--- /dev/null
+++ b/po/POTFILES.in
@@ -0,0 +1,150 @@
+[encoding: UTF-8]
+[type: gettext/rfc822deb] jobs/audio.txt.in
+[type: gettext/rfc822deb] jobs/benchmarks.txt.in
+[type: gettext/rfc822deb] jobs/bluetooth.txt.in
+[type: gettext/rfc822deb] jobs/camera.txt.in
+[type: gettext/rfc822deb] jobs/codecs.txt.in
+[type: gettext/rfc822deb] jobs/cpu.txt.in
+[type: gettext/rfc822deb] jobs/daemons.txt.in
+[type: gettext/rfc822deb] jobs/disk.txt.in
+[type: gettext/rfc822deb] jobs/esata.txt.in
+[type: gettext/rfc822deb] jobs/ethernet.txt.in
+[type: gettext/rfc822deb] jobs/expresscard.txt.in
+[type: gettext/rfc822deb] jobs/fingerprint.txt.in
+[type: gettext/rfc822deb] jobs/firewire.txt.in
+[type: gettext/rfc822deb] jobs/firmware.txt.in
+[type: gettext/rfc822deb] jobs/floppy.txt.in
+[type: gettext/rfc822deb] jobs/graphics.txt.in
+[type: gettext/rfc822deb] jobs/hibernate.txt.in
+[type: gettext/rfc822deb] jobs/info.txt.in
+[type: gettext/rfc822deb] jobs/input.txt.in
+[type: gettext/rfc822deb] jobs/install.txt.in
+[type: gettext/rfc822deb] jobs/keys.txt.in
+[type: gettext/rfc822deb] jobs/led.txt.in
+[type: gettext/rfc822deb] jobs/local.txt.in
+[type: gettext/rfc822deb] jobs/mediacard.txt.in
+[type: gettext/rfc822deb] jobs/memory.txt.in
+[type: gettext/rfc822deb] jobs/mir.txt.in
+[type: gettext/rfc822deb] jobs/miscellanea.txt.in
+[type: gettext/rfc822deb] jobs/mobilebroadband.txt.in
+[type: gettext/rfc822deb] jobs/monitor.txt.in
+[type: gettext/rfc822deb] jobs/networking.txt.in
+[type: gettext/rfc822deb] jobs/optical.txt.in
+[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
+[type: gettext/rfc822deb] jobs/smoke.txt.in
+[type: gettext/rfc822deb] jobs/sniff.txt.in
+[type: gettext/rfc822deb] jobs/stress.txt.in
+[type: gettext/rfc822deb] jobs/suspend.txt.in
+[type: gettext/rfc822deb] jobs/touchpad.txt.in
+[type: gettext/rfc822deb] jobs/touchscreen.txt.in
+[type: gettext/rfc822deb] jobs/usb.txt.in
+[type: gettext/rfc822deb] jobs/user_apps.txt.in
+[type: gettext/rfc822deb] jobs/virtualization.txt.in
+[type: gettext/rfc822deb] jobs/wireless.txt.in
+[type: gettext/python] bin/accelerometer_test
+bin/alsa_info
+bin/alsa_record_playback
+[type: gettext/python] bin/ansi_parser
+[type: gettext/python] bin/audio_driver_info
+[type: gettext/python] bin/audio_settings
+[type: gettext/python] bin/audio_test
+[type: gettext/python] bin/battery_test
+bin/bluetooth_scan
+[type: gettext/python] bin/bluetooth_test
+[type: gettext/python] bin/brightness_test
+[type: gettext/python] bin/camera_test
+bin/check_is_laptop
+[type: gettext/python] bin/cking_suite
+[type: gettext/python] bin/color_depth_info
+bin/connect_wireless
+bin/cpu_offlining
+[type: gettext/python] bin/cpu_topology
+[type: gettext/python] bin/create_connection
+bin/cycle_vts
+bin/disk_read_performance_test
+[type: gettext/python] bin/disk_smart
+bin/disk_stats_test
+bin/dns_server_test
+[type: gettext/python] bin/filter_templates
+[type: gettext/python] bin/floppy_test
+[type: gettext/python] bin/frequency_governors_test
+[type: gettext/python] bin/fresh_rate_info
+[type: gettext/python] bin/fwts_test
+[type: gettext/python] bin/gateway_ping_test
+bin/gcov_tarball
+[type: gettext/python] bin/glob_test
+[type: gettext/python] bin/gpu_test
+[type: gettext/python] bin/gputest_benchmark
+[type: gettext/python] bin/graphic_memory_info
+[type: gettext/python] bin/graphics_driver
+[type: gettext/python] bin/graphics_modes_info
+[type: gettext/python] bin/graphics_stress_test
+[type: gettext/python] bin/gst_pipeline_test
+bin/ipmi_test
+[type: gettext/python] bin/key_test
+[type: gettext/python] bin/keyboard_test
+bin/lamp_test
+bin/led_hdd_test
+[type: gettext/python] bin/lock_screen_watcher
+[type: gettext/python] bin/lsmod_info
+bin/max_diskspace_used
+[type: gettext/python] bin/memory_compare
+[type: gettext/python] bin/memory_info
+[type: gettext/python] bin/memory_test
+[type: gettext/python] bin/mm-test
+[type: gettext/python] bin/network
+[type: gettext/python] bin/network_bandwidth_test
+[type: gettext/python] bin/network_check
+[type: gettext/python] bin/network_device_info
+[type: gettext/python] bin/network_info
+[type: gettext/python] bin/network_ntp_test
+bin/network_printer_test
+[type: gettext/python] bin/network_reconnect_resume_test
+[type: gettext/python] bin/network_restart
+bin/network_wait
+[type: gettext/python] bin/obex_send
+[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
+bin/pts_run
+[type: gettext/python] bin/pulse-active-port-change
+[type: gettext/python] bin/removable_storage_test
+[type: gettext/python] bin/removable_storage_watcher
+[type: gettext/python] bin/rendercheck_test
+[type: gettext/python] bin/resolution_test
+[type: gettext/python] bin/rotation_test
+[type: gettext/python] bin/run_templates
+bin/samba_test
+[type: gettext/python] bin/screenshot_validation
+[type: gettext/python] bin/sleep_test
+[type: gettext/python] bin/sleep_test_log_check
+[type: gettext/python] bin/sleep_time_check
+bin/sources_test
+bin/spindown
+bin/storage_test
+bin/tomcat_test
+[type: gettext/python] bin/touchpad_driver_info
+[type: gettext/python] bin/touchpad_test
+[type: gettext/python] bin/udisks2_monitor
+[type: gettext/python] bin/virtualization
+[type: gettext/python] bin/volume_test
+[type: gettext/python] bin/wifi_time2reconnect
+[type: gettext/python] bin/window_test
+bin/wireless_ext
+bin/xen_test
+[type: gettext/python] bin/xml_sanitize
+[type: gettext/python] bin/xrandr_cycle
+[type: gettext/python] manage.py
+src/clocktest.c
+src/threaded_memtest.c
+data/resolution_test.qml
diff --git a/po/placeholder.txt b/po/placeholder.txt
deleted file mode 100644
index e69de29..0000000
--- a/po/placeholder.txt
+++ /dev/null
diff --git a/provider_bin/sleep_test_log_check b/provider_bin/sleep_test_log_check
deleted file mode 100755
index 9d33356..0000000
--- a/provider_bin/sleep_test_log_check
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/usr/bin/env python3
-'''
-This script is used to parse the log generated by fwts and check it for certain
-errors detected during testing. It expects that this is a log file created by
-fwts at runtime using the -l <log name> option.
-
-It's written now specifically for checking ater the fwts s3 and s4 tests but
-can be adapted to look for other tests, or all tests.
-'''
-
-import sys
-
-from argparse import ArgumentParser, RawTextHelpFormatter
-
-
-def main():
- parser = ArgumentParser()
- parser.add_argument('-v', '--verbose',
- action='store_true',
- default=False,
- help="Display each error discovered. May provide \
- very long output. Also, this option will only \
- provide a list of UNIQUE errors encountered in \
- the log file. It will not display duplicates. \
- Default is [%(default)s]")
- parser.add_argument('test',
- action='store',
- help='The test to check (s3 or s4)')
- parser.add_argument('logfile',
- action='store',
- help='The log file to parse')
-
- args = parser.parse_args()
-
- return_code = 0
- 
- #Create a generator and get our lines
- log = (line.rstrip() for line in open(args.logfile,'r'))
-
- #Now parse and find out error lines. We're looking for specific keys that
- #occur in the summary section for each test run.
- #Error levels we care about:
- levels = ('critical', 'high', 'medium')
- errors = {}
- for level in levels:
- errors[level] = []
- for logline in log:
- for level in levels:
- if "%s: %s" % (args.test, level.upper()) in logline:
- line = logline.split(']',1)[1].strip()
- #Only include unique lines to avoid hundreds of repititions
- if line not in errors[level]:
- errors[level].append(line)
-
- for level in levels:
- if errors[level]:
- return_code = 1
- print("%s errors: %s" % (level.upper(), len(errors[level])))
- if args.verbose:
- #Print the actual errors)
- print('='*40)
- for line in errors[level]:
- print(line)
- print('\n')
- 
- if return_code == 0:
- print("No errors detected")
-
- return return_code
-
-if __name__ == '__main__':
- sys.exit(main())
diff --git a/provider_data/websites/PNG_Color_Image_Ubuntu.png b/provider_data/websites/PNG_Color_Image_Ubuntu.png
deleted file mode 100644
index 93d6a8f..0000000
--- a/provider_data/websites/PNG_Color_Image_Ubuntu.png
+++ /dev/null
diff --git a/provider_jobs/local.txt.in b/provider_jobs/local.txt.in
deleted file mode 100644
index 966eef8..0000000
--- a/provider_jobs/local.txt.in
+++ /dev/null
@@ -1,321 +0,0 @@
-name: __audio__
-plugin: local
-_description: Audio tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/audio.txt?(.in)
-
-name: __benchmarks__
-plugin: local
-_description: Benchmarks tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/benchmarks.txt?(.in)
-
-name: __bluetooth__
-plugin: local
-_description: Bluetooth tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/bluetooth.txt?(.in)
-
-name: __camera__
-plugin: local
-_description: Camera tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/camera.txt?(.in)
-
-name: __codecs__
-plugin: local
-_description: Codec tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/codecs.txt?(.in)
-
-name: __cpu__
-plugin: local
-_description: CPU tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/cpu.txt?(.in)
-
-name: __daemons__
-plugin: local
-_description: System Daemon tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/daemons.txt?(.in)
-
-name: __disk__
-plugin: local
-_description: Disk tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/disk.txt?(.in)
-
-name: __ethernet__
-plugin: local
-_description: Ethernet Device tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/ethernet.txt?(.in)
-
-name: __esata__
-plugin: local
-_description: eSATA disk tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/esata.txt?(.in)
-
-name: __fingerprint__
-plugin: local
-_description: Fingerprint reader tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/fingerprint.txt?(.in)
-
-name: __firewire__
-plugin: local
-_description: Firewire disk tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/firewire.txt?(.in)
-
-name: __firmware__
-plugin: local
-_description: Firmware tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/firmware.txt?(.in)
-
-name: __floppy__
-plugin: local
-_description: Floppy disk tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/floppy.txt?(.in)
-
-name: __graphics__
-plugin: local
-_description: Graphics tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/graphics.txt?(.in)
-
-name: __hibernate__
-plugin: local
-_description: Hibernation tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/hibernate.txt?(.in)
-
-name: __info__
-plugin: local
-_description: Informational tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/info.txt?(.in)
-
-name: __input__
-plugin: local
-_description: Input Devices tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/input.txt?(.in)
-
-name: __install__
-plugin: local
-_description: Software Installation tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/install.txt?(.in)
-
-name: __keys__
-plugin: local
-_description: Hotkey tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/keys.txt?(.in)
-
-name: __led__
-plugin: local
-_description: LED tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/led.txt?(.in)
-
-name: __mediacard__
-plugin: local
-_description: Media Card tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/mediacard.txt?(.in)
-
-name: __memory__
-plugin: local
-_description: Memory tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/memory.txt?(.in)
-
-name: __rendercheck__
-plugin: local
-_description: Rendercheck tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/rendercheck.txt?(.in)
-
-name: __miscellanea__
-plugin: local
-_description: Miscellaneous tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/miscellanea.txt?(.in)
-
-name: __monitor__
-plugin: local
-_description: Monitor tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/monitor.txt?(.in)
-
-name: __networking__
-plugin: local
-_description: Non-device specific networking tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/networking.txt?(.in)
-
-name: __optical__
-plugin: local
-_description: Optical Drive tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/optical.txt?(.in)
-
-name: __panel_clock__
-plugin: local
-_description: Panel Clock Verification tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/panel_clock_test.txt?(.in)
-
-name: __panel_reboot__
-plugin: local
-_description: Panel Reboot Verification tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/panel_reboot.txt?(.in)
-
-name: __expresscard__
-plugin: local
-_description: ExpressCard tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/expresscard.txt?(.in)
-
-name: __peripheral__
-plugin: local
-_description: Peripheral tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/peripheral.txt?(.in)
-
-name: __piglit__
-plugin: local
-_description: Piglit tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/piglit.txt?(.in)
-
-name: __power-management__
-plugin: local
-_description: Power Management tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/power-management.txt?(.in)
-
-name: __server-services__
-plugin: local
-_description: Server Services checks
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/server-services.txt?(.in)
-
-name: __suspend__
-plugin: local
-_description: Suspend tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/suspend.txt?(.in)
-
-name: __touchpad__
-plugin: local
-_description: Touchpad tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/touchpad.txt?(.in)
-
-name: __touchscreen__
-plugin: local
-_description: Touchscreen tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/touchscreen.txt?(.in)
-
-name: __usb__
-plugin: local
-_description: USB tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/usb.txt?(.in)
-
-name: __user_apps__
-plugin: local
-_description: User Applications
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/user_apps.txt?(.in)
-
-name: __virtualization__
-plugin: local
-_description: Virtualization tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/virtualization.txt?(.in)
-
-name: __wireless__
-plugin: local
-_description: Wireless networking tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/wireless.txt?(.in)
-
-name: __mobilebroadband__
-plugin: local
-_description: Mobile broadband tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/mobilebroadband.txt?(.in)
-
-name: __stress__
-plugin: local
-_description: Stress tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/stress.txt?(.in)
-
-name: __smoke__
-plugin: local
-_description: Smoke tests
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/smoke.txt?(.in)
-
-name: __sniff__
-plugin: local
-_description: Sniff Sniffers
-command:
- shopt -s extglob
- cat $CHECKBOX_SHARE/jobs/sniff.txt?(.in)
diff --git a/provider_jobs/rendercheck.txt.in b/provider_jobs/rendercheck.txt.in
deleted file mode 100644
index 4204c52..0000000
--- a/provider_jobs/rendercheck.txt.in
+++ /dev/null
@@ -1,13 +0,0 @@
-plugin: shell
-name: rendercheck/tests
-requires:
- package.name == 'x11-apps'
-command: ( rendercheck_test -b repeat -b gradients -d -o $CHECKBOX_DATA/rendercheck-results && echo "Rendercheck tests completed successfully" ) || ( echo "Error running rendercheck. Please see the log $CHECKBOX_DATA/rendercheck-results for details" >&2 && false )
-_description:
- Runs all of the rendercheck test suites. This test can take a few minutes.
-
-plugin: attachment
-name: rendercheck/tarball
-depends: rendercheck/tests
-command: [ -e $CHECKBOX_DATA/rendercheck-results ] && tar cvfz $CHECKBOX_DATA/rendercheck-results.tar.gz $CHECKBOX_DATA/rendercheck-results && cat $CHECKBOX_DATA/rendercheck-results.tar.gz
-_description: Attach log from rendercheck tests
diff --git a/provider_jobs/stress.txt.in b/provider_jobs/stress.txt.in
deleted file mode 100644
index e9a8428..0000000
--- a/provider_jobs/stress.txt.in
+++ /dev/null
@@ -1,241 +0,0 @@
-plugin: shell
-name: stress/cpu_stress_test
-requires:
- package.name == 'stress'
-user: root
-command: num_vm=$(awk '/MemTotal/ {x=$2/262144; print ((x == int(x)) ? x : int(x) +1)}' /proc/meminfo); vm_bytes=$(($(awk '/MemTotal/ {print int($2/1024)}' /proc/meminfo)/$num_vm/4))M; stress --cpu `cpuinfo_resource | awk '/count:/ {print $2}'` --vm $num_vm --vm-bytes $vm_bytes --timeout 7200s
-_description:
- PURPOSE:
- Create jobs that use the CPU as much as possible for two hours. The test is considered passed if the system does not freeze.
-
-plugin: shell
-name: power-management/hibernate_30_cycles
-depends:
- power-management/hibernate_advanced
-requires:
- sleep.disk == 'supported'
- rtc.state == 'supported'
-environ: CHECKBOX_DATA
-user: root
-command:
- if type -P fwts >/dev/null; then
- echo "Calling fwts"
- fwts_test -l $CHECKBOX_DATA/hibernate_30_cycles -f none -s s4 --s4-device-check --s4-device-check-delay=45 --s4-sleep-delay=120 --s4-multiple=30
- else
- echo "Calling sleep_test"
- set -o pipefail; sleep_test -s disk -i 30 -w 120 | tee $CHECKBOX_DATA/hibernate_30_cycles.log
- fi
-_description:
- PURPOSE:
- This is an automated stress test that will force the system to hibernate/resume for 30 cycles
-
-plugin: shell
-name: power-management/hibernate-30-cycles-log-check
-command: [ -e $CHECKBOX_DATA/hibernate_30_cycles.log ] && sleep_test_log_check -v s4 $CHECKBOX_DATA/hibernate_30_cycles.log
-_description:
- Automated check of the 30 cycle hibernate log for errors detected by fwts.
-
-plugin: attachment
-name: power-management/hibernate-30-cycle-log-attach
-command: [ -e $CHECKBOX_DATA/hibernate_30_cycles.log ] && cat $CHECKBOX_DATA/hibernate_30_cycles.log
-_description:
- Attaches the log from the 30 cycle Hibernate/Resume test if it exists
-
-plugin: shell
-name: power-management/suspend_30_cycles
-depends:
- power-management/rtc
- suspend/suspend_advanced
-environ: CHECKBOX_DATA
-user: root
-command:
- if type -P fwts >/dev/null; then
- echo "Calling fwts"
- set -o pipefail; fwts_test -l $CHECKBOX_DATA/suspend_30_cycles -f none -s s3 --s3-device-check --s3-device-check-delay=45 --s3-sleep-delay=30 --s3-multiple=30 | tee $CHECKBOX_DATA/suspend_30_cycles_times.log
- else
- echo "Calling sleep_test"
- set -o pipefail; sleep_test -p -s mem -i 30 | tee $CHECKBOX_DATA/suspend_30_cycles.log
- fi
-_description:
- PURPOSE:
- This is an automated stress test that will force the system to suspend/resume for 30 cycles.
-
-plugin: shell
-name: power-management/suspend-30-cycles-log-check
-command: [ -e $CHECKBOX_DATA/suspend_30_cycles.log ] && sleep_test_log_check -v s3 $CHECKBOX_DATA/suspend_30_cycles.log
-_description:
- Automated check of the 30 cycle hibernate log for errors detected by fwts.
-
-plugin: attachment
-name: power-management/suspend-30-cycle-log-attach
-command: [ -e $CHECKBOX_DATA/suspend_30_cycles.log ] && cat $CHECKBOX_DATA/suspend_30_cycles.log
-_description:
- Attaches the log from the 30 cycle Suspend/Resume test if it exists
-
-plugin: shell
-name: power-management/suspend-30-cycles-time-check
-command: [ -e $CHECKBOX_DATA/suspend_30_cycles_times.log ] && sleep_time_check $CHECKBOX_DATA/suspend_30_cycles_times.log
-_description:
- Checks the sleep times to ensure that a machine suspends and resumes within a given threshold
-
-plugin: shell
-name: stress/hibernate_250_cycles
-depends: power-management/rtc
-environ: CHECKBOX_DATA
-user: root
-command:
- if type -P fwts >/dev/null; then
- echo "Calling fwts"
- fwts_test -l $CHECKBOX_DATA/hibernate_250_cycles -s s4 --s4-device-check --s4-device-check-delay=45 --s4-sleep-delay=120 --s4-multiple=250
- else
- echo "Calling sleep_test"
- set -o pipefail; sleep_test -s disk -i 250 -w 120 | tee $CHECKBOX_DATA/hibernate_250_cycles.log
- fi
-_description:
- PURPOSE:
- This is an automated stress test that will force the system to hibernate/resume for 250 cycles
-
-plugin: attachment
-name: stress/hibernate-250-cycle-log-attach
-command: [ -e $CHECKBOX_DATA/hibernate_250_cycles.log ] && cat $CHECKBOX_DATA/hibernate_250_cycles.log
-_description:
- Attaches the log from the 250 cycle Hibernate/Resume test if it exists
-
-plugin: shell
-name: stress/suspend_250_cycles
-depends: power-management/rtc
-environ: CHECKBOX_DATA
-user: root
-command:
- if type -P fwts >/dev/null; then
- echo "Calling fwts"
- set -o pipefail; fwts_test -l $CHECKBOX_DATA/suspend_250_cycles -s s3 --s3-device-check --s3-device-check-delay=45 --s3-sleep-delay=30 --s3-multiple=250 | tee $CHECKBOX_DATA/suspend_250_cycles_times.log
- else
- echo "Calling sleep_test"
- set -o pipefail; sleep_test -p -s mem -i 250 | tee $CHECKBOX_DATA/suspend_250_cycles.log
- fi
-_description:
- PURPOSE:
- This is an automated stress test that will force the system to suspend/resume for 250 cycles.
-
-plugin: attachment
-name: stress/suspend-250-cycle-log-attach
-command: [ -e $CHECKBOX_DATA/suspend_250_cycles.log ] && cat $CHECKBOX_DATA/suspend_250_cycles.log
-_description:
- Attaches the log from the 250 cycle Suspend/Resume test if it exists
-
-plugin: shell
-name: stress/suspend-250-cycles-time-check
-command: [ -e $CHECKBOX_DATA/suspend_250_cycles_times.log ] && sleep_time_check $CHECKBOX_DATA/suspend_250_cycles_times.log
-_description:
- Checks the sleep times to ensure that a machine suspends and resumes within a given threshold
-
-plugin: shell
-name: stress/reboot
-requires:
- package.name == 'upstart'
- package.name == 'fwts'
-command: pm_test -r 100 --silent --log-level=notset reboot --log-dir=$CHECKBOX_DATA
-user: root
-environ: CHECKBOX_DATA
-_description:
- Stress reboot system (100 cycles)
-
-plugin: attachment
-name: stress/reboot_log
-depends: stress/reboot
-command: tar cvfz $CHECKBOX_DATA/stress_reboot.tgz $CHECKBOX_DATA/*reboot.100.log && cat $CHECKBOX_DATA/stress_reboot.tgz
-
-plugin: shell
-name: stress/poweroff
-requires:
- package.name == 'upstart'
- package.name == 'fwts'
-command: pm_test -r 100 --silent --log-level=notset poweroff --log-dir=$CHECKBOX_DATA
-user: root
-environ: CHECKBOX_DATA
-_description:
- Stress poweroff system (100 cycles)
-
-plugin: attachment
-name: stress/poweroff_log
-depends: stress/poweroff
-command: tar cvfz $CHECKBOX_DATA/stress_poweroff.tgz $CHECKBOX_DATA/*poweroff.100.log && cat $CHECKBOX_DATA/stress_poweroff.tgz
-
-plugin: shell
-name: stress/reboot_check
-depends: stress/reboot
-command: pm_log_check --log-level=notset $CHECKBOX_DATA/pm_test.reboot.100.log $CHECKBOX_DATA/pm_log_check_reboot.100.log
-_description: Check logs for the stress reboot (100 cycles) test case
-
-plugin: attachment
-name: stress/reboot_check_log
-depends: stress/reboot_check
-command:
- tar cvfz $CHECKBOX_DATA/stress_reboot_check.tgz $CHECKBOX_DATA/pm_log_check_reboot.100.log && cat $CHECKBOX_DATA/stress_reboot_check.tgz
-
-plugin: shell
-name: stress/poweroff_check
-depends: stress/poweroff
-command: pm_log_check --log-level=notset $CHECKBOX_DATA/pm_test.poweroff.100.log $CHECKBOX_DATA/pm_log_check_poweroff.100.log
-_description: Check logs for the stress poweroff (100 cycles) test case
-
-plugin: attachment
-name: stress/poweroff_check_log
-depends: stress/poweroff_check
-command:
- tar cvfz $CHECKBOX_DATA/stress_poweroff_check.tgz $CHECKBOX_DATA/pm_log_check_poweroff.100.log && cat $CHECKBOX_DATA/stress_poweroff_check.tgz
-
-plugin: shell
-name: stress/graphics
-requires:
- package.name == 'x11-apps'
-user: root
-environ: CHECKBOX_DATA
-command: graphics_stress_test -b repeat -d -o $CHECKBOX_DATA/graphics-stress-results && echo "Graphics Stress Test completed successfully" || echo "Graphics Stress Test completed, but there are errors. Please see the log $CHECKBOX_DATA/graphics-stress-results for details" && false
-_description:
- Run the graphics stress test. This test can take a few minutes.
-
-plugin: shell
-name: stress/graphics-tarball
-requires:
- package.name == 'x11-apps'
-depends: stress/graphics
-command: [ -e $CHECKBOX_DATA/graphics-stress-results ] && tar cvfz $CHECKBOX_DATA/graphics-stress-results.tar.gz $CHECKBOX_DATA/graphics-stress-results
-_description: Attaches the graphics stress results to the submission.
-
-plugin: shell
-name: stress/usb
-user: root
-command: removable_storage_test -s 10240000 -c 100 -i 3 usb
-_description: Runs a test that transfers 100 10MB files 3 times to usb.
-
-plugin: shell
-name: stress/sdhc
-user: root
-command: removable_storage_test -s 10240000 -c 100 -i 3 sdio scsi usb --memorycard
-_description: Runs a test that transfers 100 10MB files 3 times to a SDHC card.
-
-plugin: shell
-name: stress/network_restart
-user: root
-environ: CHECKBOX_DATA
-command: network_restart -t 1 -o $CHECKBOX_DATA
-_description: Ping ubuntu.com and restart network interfaces 100 times
-
-plugin: attachment
-name: stress/network_restart_log
-depends: stress/network_restart
-command: file=$CHECKBOX_DATA/network_restart.log; if [ -e "$file" ]; then iconv -t 'ascii' -c "$file"; fi
-
-plugin: manual
-name: stress/wireless_hotkey
-requires: dmi.product in ['Notebook','Laptop','Portable']
-_description:
- PURPOSE:
- To make sure that stressing the wifi hotkey does not cause applets to disappear from the panel or the system to lock up
- STEPS:
- 1. Log in to desktop
- 2. Press wifi hotkey at a rate of 1 press per second and slowly increase the speed of the tap, until you are tapping as fast as possible
- VERIFICATION:
- Verify the system is not frozen and the wifi and bluetooth applets are still visible and functional
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index 4798105..0000000
--- a/setup.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-[build_i18n]
-rfc822deb_files=[
- ("lib/plainbox-providers-1/checkbox/jobs",
- glob.glob('provider_jobs/*'))]
-
-[upload]
-sign=True
diff --git a/setup.py b/setup.py
deleted file mode 100755
index 734a0cd..0000000
--- a/setup.py
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/usr/bin/env python3
-# This file is part of Checkbox.
-#
-# Copyright 2013 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/>.
-
-from distutils.ccompiler import new_compiler
-from glob import glob
-import os
-
-from DistUtilsExtra.command import build_extra
-import DistUtilsExtra.auto
-
-with open("README.rst", encoding="UTF-8") as stream:
- LONG_DESCRIPTION = stream.read()
-
-PROVIDER_PATH = "/usr/lib/plainbox-providers-1/checkbox/"
-
-DATA_FILES = [
- (os.path.join(PROVIDER_PATH, 'bin'), glob("provider_bin/*")),
- (os.path.join(PROVIDER_PATH, 'whitelists'), glob("provider_whitelists/*")),
- ("/usr/share/plainbox-providers-1", ["checkbox.provider"])
-]
-DATA_FILES.extend([
- (os.path.join(PROVIDER_PATH, root.replace('provider_data', 'data')),
- [os.path.join(root, f) for f in files])
- for root, dirs, files in os.walk('provider_data', followlinks=True)
-])
-
-
-class Build(build_extra.build_extra):
-
- def run(self):
- # Build our own POTFILES.in as DistUtilsExtra does not include rfc822
- # files automatically
- with open('po/POTFILES.in', 'w') as potfiles_in:
- potfiles_in.write('[encoding: UTF-8]\n')
- for f in glob("provider_jobs/*"):
- potfiles_in.write('[type: gettext/rfc822deb] ' + f + '\n')
- for f in glob("provider_bin/*"):
- potfiles_in.write(f + '\n')
-
- build_extra.build_extra.run(self)
-
- cc = new_compiler()
- for source in glob('provider_bin/*.c'):
- executable = os.path.splitext(source)[0]
- cc.link_executable(
- [source], executable, libraries=["rt", "pthread"],
- # Enforce security with CFLAGS + LDFLAGS (see dpkg-buildflags)
- extra_preargs=[
- "-g", "-O2", "-fstack-protector",
- "--param=ssp-buffer-size=4", "-Wformat",
- "-Werror=format-security",
- "-Wl,-Bsymbolic-functions",
- "-Wl,-z,relro"])
-
- os.unlink('po/POTFILES.in')
-
-
-DistUtilsExtra.auto.setup(
- # To work as expected, the provider content lives in directories starting
- # with provider_ so that DistUtilsExtra auto features avoid putting files
- # in /usr/bin and /usr/share automatically.
- name="plainbox-provider-checkbox",
- version="0.3",
- url="https://launchpad.net/checkbox/",
- author="Sylvain Pineau",
- author_email="sylvain.pineau@canonical.com",
- license="GPLv3",
- description="CheckBox provider",
- long_description=LONG_DESCRIPTION,
- data_files=DATA_FILES,
- cmdclass={'build': Build},
- )
diff --git a/src/EXECUTABLES b/src/EXECUTABLES
new file mode 100644
index 0000000..1f505d9
--- /dev/null
+++ b/src/EXECUTABLES
@@ -0,0 +1,2 @@
+clocktest
+threaded_memtest
diff --git a/src/Makefile b/src/Makefile
new file mode 100644
index 0000000..49d167b
--- /dev/null
+++ b/src/Makefile
@@ -0,0 +1,11 @@
+.PHONY:
+all: clocktest threaded_memtest
+
+.PHONY: clean
+clean:
+	rm -f clocktest threaded_memtest
+
+threaded_memtest: CFLAGS += -pthread
+threaded_memtest: CFLAGS += -Wno-unused-but-set-variable
+
+CFLAGS += -Wall
diff --git a/provider_bin/clocktest.c b/src/clocktest.c
index 5aadb96..5aadb96 100644
--- a/provider_bin/clocktest.c
+++ b/src/clocktest.c
diff --git a/provider_bin/threaded_memtest.c b/src/threaded_memtest.c
index 498e645..aa644af 100644
--- a/provider_bin/threaded_memtest.c
+++ b/src/threaded_memtest.c
@@ -31,6 +31,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
+#ifdef __linux__
 #include <sys/sysinfo.h>
 #include <sys/mman.h>
 #include <sys/time.h>
@@ -419,3 +420,9 @@ int main(int argc, char **argv) {
 printf("Testing complete.\n");
 return rv;
 }
+#else
+int main(int argc, char **argv) {
+ printf("Unsupported architecture\n");
+ return 1;
+}
+#endif
diff --git a/provider_whitelists/autotesting.whitelist b/whitelists/autotesting.whitelist
index 7895cd8..87ae61b 100644
--- a/provider_whitelists/autotesting.whitelist
+++ b/whitelists/autotesting.whitelist
@@ -1,6 +1,7 @@
 ## This whitelist is used for automated testing of the test cases themselves.
 # These resources are needed for a valid submission, so they are included
 # explicitly, even if they are usually run implicitly by jobs requiring them.
+IEEE_80211
 cpuinfo
 dpkg
 lsb
@@ -77,6 +78,8 @@ wireless/wireless_connection_wpa_bg
 wireless/wireless_connection_open_bg
 wireless/wireless_connection_wpa_n
 wireless/wireless_connection_open_n
+wireless/wireless_connection_wpa_ac
+wireless/wireless_connection_open_ac
 wireless/monitor_wireless_connection_udp
 __suspend__
 suspend/audio_before_suspend
@@ -102,6 +105,8 @@ suspend/wireless_connection_after_suspend_wpa_bg_auto
 suspend/wireless_connection_after_suspend_open_bg_auto
 suspend/wireless_connection_after_suspend_wpa_n_auto
 suspend/wireless_connection_after_suspend_open_n_auto
+suspend/wireless_connection_after_suspend_wpa_ac_auto
+suspend/wireless_connection_after_suspend_open_ac_auto
 suspend/gpu_lockup_after_suspend
 suspend/screenshot_after_suspend
 screenshot_after_suspend.jpg
diff --git a/provider_whitelists/default.whitelist b/whitelists/default.whitelist
index 84563b0..d9d653c 100644
--- a/provider_whitelists/default.whitelist
+++ b/whitelists/default.whitelist
@@ -1,23 +1,7 @@
-block_device
-cdimage
-cpuinfo
-device
-display
-dmi
-dpkg
-efi
-environment
-gconf
-lsb
-meminfo
-module
 optical_drive
-package
-rtc
-sleep
-uname
-usb
-xinput
+__miscellanea__
+miscellanea/submission-resources
+miscellanea/is_laptop
 __info__
 codecs_attachment
 cpuinfo_attachment
@@ -95,8 +79,6 @@ mediacard/cf-storage
 mediacard/cf-remove
 __memory__
 memory/info
-__miscellanea__
-miscellanea/is_laptop
 __monitor__
 monitor/hdmi
 monitor/vga
diff --git a/provider_whitelists/hwsubmit.whitelist b/whitelists/hwsubmit.whitelist
index dbb5602..dbb5602 100644
--- a/provider_whitelists/hwsubmit.whitelist
+++ b/whitelists/hwsubmit.whitelist
diff --git a/provider_whitelists/smoke.whitelist b/whitelists/smoke.whitelist
index 98e287d..98e287d 100644
--- a/provider_whitelists/smoke.whitelist
+++ b/whitelists/smoke.whitelist
diff --git a/provider_whitelists/sniff.whitelist b/whitelists/sniff.whitelist
index a68fefc..a68fefc 100644
--- a/provider_whitelists/sniff.whitelist
+++ b/whitelists/sniff.whitelist
diff --git a/provider_whitelists/sru.whitelist b/whitelists/sru.whitelist
index 3657847..106e7f6 100644
--- a/provider_whitelists/sru.whitelist
+++ b/whitelists/sru.whitelist
@@ -1,6 +1,7 @@
 ## This whitelist contains tests that are useful for validating a Stable
 ## Release Update (SRU) on Ubuntu Certified systems. This whitelist is not
 ## recommended for, nor will it be accepted for self-testing purposes.
+IEEE_80211
 block_device
 cdimage
 cpuinfo
@@ -60,6 +61,8 @@ graphics/screenshot
 screenshot.jpg
 graphics/screenshot_fullscreen_video
 screenshot_fullscreen_video.jpg
+graphics/screenshot_opencv_validation
+screenshot_opencv_validation.jpg
 __install__
 install/apt-get-gets-updates
 __mediacard__