Merge lp:~zyga/checkbox/fixes into lp:checkbox

[Zygmunt Krynicki]

78c4913 checkbox-touch: fix embedded provider loader after API changes

[lp:~zyga/checkbox/fixes]

3413. By Zygmunt Krynicki on 2014-11-14

checkbox-touch: fix embedded provider loader after API changes

This patch fixes the embedded provider plug-in to adhere to the extended
plug-in API.

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

[Maciej Kisielewski (kissiel)]

+1, Thanks!

review: Approve

=== modified file 'checkbox-touch/py/embedded_providers.py'
--- checkbox-touch/py/embedded_providers.py	2014-11-13 23:14:59 +0000
+++ checkbox-touch/py/embedded_providers.py	2014-11-14 07:09:51 +0000
@@ -22,16 +22,16 @@
 
 This module contains custom providers used by Checkbox-touch
 """
+# NOTE: this is python 3.3 only
 from importlib.machinery import SourceFileLoader
-import logging
 import os
 
-from plainbox.abc import IProvider1, IProviderBackend1
+from plainbox.impl.secure.config import Unset
 from plainbox.impl.secure.plugins import FsPlugInCollection
+from plainbox.impl.secure.plugins import now
 from plainbox.impl.secure.providers.v1 import Provider1
 from plainbox.impl.secure.providers.v1 import Provider1Definition
 from plainbox.impl.secure.providers.v1 import Provider1PlugIn
-from plainbox.impl.secure.config import Unset
 
 
 class ManagePyProvider1PlugIn(Provider1PlugIn):
@@ -39,15 +39,16 @@
     Provider1PlugIn that is built from manage.py file.
     """
 
-    def __init__(self, filename, file_contents, plugin_load_time, *, validate=None,
+    def __init__(self, filename, file_contents, load_time, *, validate=None,
                  validation_kwargs=None, check=None, context=None):
         """
         Initialize plug-in and create provider from definition extracted
         from manage.py pointed by `filename`
         """
-
+        self._load_time = load_time
         # override provider_manager.setup() to capture setup's parameters
         setup_kwargs = []
+        start_time = now()
 
         def fake_setup(**kwargs):
             setup_kwargs.append(kwargs)
@@ -74,6 +75,37 @@
         self._provider = Provider1.from_definition(
             definition, secure=False, validate=validate,
             validation_kwargs=validation_kwargs, check=check, context=context)
+        self._wrap_time = now() - start_time
+
+    @property
+    def plugin_name(self):
+        """
+        plugin name, the namespace of the provider
+        """
+        return self._provider.name
+
+    @property
+    def plugin_object(self):
+        """
+        plugin object, the actual Provider1 instance
+        """
+        return self._provider
+
+    @property
+    def plugin_load_time(self) -> float:
+        """
+        time, in fractional seconds, that was needed to load the provider
+        definition file from the file system
+        """
+        return self._load_time
+
+    @property
+    def plugin_wrap_time(self) -> float:
+        """
+        time, in fractional seconds, that was needed to load the provider from
+        the definition text
+        """
+        return self._wrap_time
 
 
 class EmbeddedProvider1PlugInCollection(FsPlugInCollection):