Merge lp:~zyga/checkbox/tb-tests into lp:checkbox

[Zygmunt Krynicki]

3cf2026 plainbox:provider_manager: load manifest provider for validation
7a9b72b providers:checkbox: add monitor/thunderbolt job

[Daniel Manrique (roadmr)]

One comment on the job itself, the stopgap measure looks hacky but it's probably needed for now so I won't comment too much on that one (LGTM).

review: Needs Fixing

[lp:~zyga/checkbox/tb-tests]

3643. By Zygmunt Krynicki on 2015-04-01

providers:checkbox: add monitor/thunderbolt job

This patch adds a clone of the 'monitor/hdmi' job for testing
Thunderbolt displays. The test depends on the manifest resource,
specifically on the 'has_thunderbolt' manifest entry.

I've stripped out the wording that said to skip the test if there is no
such port since that's what the manifest is for to tell us.

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

[Daniel Manrique (roadmr)]

Thanks, looks clearer now.

review: Approve

=== modified file 'plainbox/plainbox/provider_manager.py'
--- plainbox/plainbox/provider_manager.py	2015-03-31 11:12:52 +0000
+++ plainbox/plainbox/provider_manager.py	2015-04-01 16:50:56 +0000
@@ -46,6 +46,7 @@
 from plainbox.impl.job import JobDefinition
 from plainbox.impl.logging import setup_logging
 from plainbox.impl.providers.special import get_categories
+from plainbox.impl.providers.special import get_manifest
 from plainbox.impl.providers.v1 import InsecureProvider1PlugInCollection
 from plainbox.impl.providers.v1 import get_user_PROVIDERPATH_entry
 from plainbox.impl.secure.config import Unset
@@ -1043,6 +1044,11 @@
         categories_provider = get_categories()
         if provider.base_dir != categories_provider.base_dir:
             provider_list.append(categories_provider)
+        # Add the built-in 'manifest' provider,
+        # unless that's the one we're testing
+        manifest_provider = get_manifest()
+        if provider.base_dir != manifest_provider.base_dir:
+            provider_list.append(manifest_provider)
         _logger.info(_("Validating everything..."))
         unit_list, exc_list = self.collect_all_units(provider)
         early_issue_gen = self.get_early_issues(exc_list)

=== modified file 'providers/plainbox-provider-checkbox/jobs/monitor.txt.in'
--- providers/plainbox-provider-checkbox/jobs/monitor.txt.in	2014-11-10 01:31:35 +0000
+++ providers/plainbox-provider-checkbox/jobs/monitor.txt.in	2015-04-01 16:50:56 +0000
@@ -47,6 +47,20 @@
      Was the desktop displayed correctly on both screens?
 
 plugin: manual
+id: monitor/thunderbolt
+imports: from 2013.com.canonical.plainbox import manifest
+requires: manifest.has_thunderbolt == 'True'
+_summary: Display connected via Thunderbolt
+_description:
+ PURPOSE:
+     This test will check your Thunderbolt port as a monitor interconnect.
+ STEPS:
+     1. Connect a display (if not already connected) to the Thunderbolt port on
+        your system
+ VERIFICATION:
+     Was the desktop displayed correctly on the Thunderbolt-connected screen?
+
+plugin: manual
 id: monitor/svideo
 requires: display.svideo == 'supported'
 _description: