Add setup method for plugs

Author: jonny12375

openhtf/core/base_plugs.py

@@ -169,6 +169,9 @@ def _asdict(self) -> Dict[Text, Any]:
     """
     return {}
 
+  def setUp(self) -> None:
+    """This method is called automatically at the start of each Test execution."""
+
   def tearDown(self) -> None:
     """This method is called automatically at the end of each Test execution."""
 

openhtf/plugs/__init__.py

@@ -258,47 +258,50 @@ def initialize_plugs(
     """
     types = plug_types if plug_types is not None else self._plug_types
     for plug_type in types:
+      plug_instance: plug_type
       if plug_type in self._unmanaged_plugs:
+        plug_instance = self._unmanaged_plugs[plug_type]
         continue
-
-      # Create a logger for this plug. All plug loggers go under the 'plug'
-      # sub-logger in the logger hierarchy.
-      plug_logger = self.logger.getChild(plug_type.__name__)
-      if plug_type in self._plugs_by_type:
-        continue
-      try:
-        if not issubclass(plug_type, base_plugs.BasePlug):
-          raise base_plugs.InvalidPlugError(
-            'Plug type "{}" is not an instance of base_plugs.BasePlug'.format(
-              plug_type))
-
-        # The following method of swapping out loggers is not thread-safe, so it is wrapped in a lock.
-        with plug_type.init_lock:
-          if plug_type.logger != _BASE_PLUGS_LOG:
-            # They put a logger attribute on the class itself, overriding ours.
+      else:
+        # Create a logger for this plug. All plug loggers go under the 'plug'
+        # sub-logger in the logger hierarchy.
+        plug_logger = self.logger.getChild(plug_type.__name__)
+        if plug_type in self._plugs_by_type:
+          continue
+        try:
+          if not issubclass(plug_type, base_plugs.BasePlug):
+            raise base_plugs.InvalidPlugError(
+              'Plug type "{}" is not an instance of base_plugs.BasePlug'.format(
+                plug_type))
+
+          # The following method of swapping out loggers is not thread-safe, so it is wrapped in a lock.
+          with plug_type.init_lock:
+            if plug_type.logger != _BASE_PLUGS_LOG:
+              # They put a logger attribute on the class itself, overriding ours.
+              raise base_plugs.InvalidPlugError(
+                'Do not override "logger" in your plugs.', plug_type)
+            # Override the logger so that __init__'s logging goes into the record.
+            plug_type.logger = plug_logger
+            try:
+              plug_instance = plug_type()
+            finally:
+              # Now set it back since we'll give the instance a logger in a moment.
+              plug_type.logger = _BASE_PLUGS_LOG
+          # Set the logger attribute directly (rather than in base_plugs.BasePlug)
+          # so we don't depend on subclasses' implementation of __init__ to have
+          # it set.
+          if plug_instance.logger != _BASE_PLUGS_LOG:
             raise base_plugs.InvalidPlugError(
-              'Do not override "logger" in your plugs.', plug_type)
-          # Override the logger so that __init__'s logging goes into the record.
-          plug_type.logger = plug_logger
-          try:
-            plug_instance = plug_type()
-          finally:
-            # Now set it back since we'll give the instance a logger in a moment.
-            plug_type.logger = _BASE_PLUGS_LOG
-        # Set the logger attribute directly (rather than in base_plugs.BasePlug)
-        # so we don't depend on subclasses' implementation of __init__ to have
-        # it set.
-        if plug_instance.logger != _BASE_PLUGS_LOG:
-          raise base_plugs.InvalidPlugError(
-            'Do not set "self.logger" in __init__ in your plugs', plug_type)
-        else:
-          # Now the instance has its own copy of the test logger.
-          plug_instance.logger = plug_logger
-      except Exception:  # pylint: disable=broad-except
-        plug_logger.exception('Exception instantiating plug type %s', plug_type)
-        self.tear_down_plugs()
-        raise
+              'Do not set "self.logger" in __init__ in your plugs', plug_type)
+          else:
+            # Now the instance has its own copy of the test logger.
+            plug_instance.logger = plug_logger
+        except Exception:  # pylint: disable=broad-except
+          plug_logger.exception('Exception instantiating plug type %s', plug_type)
+          self.tear_down_plugs()
+          raise
       self.update_plug(plug_type, plug_instance)
+      plug_instance.setUp()
 
   def get_plug_by_class_path(self,
                              plug_name: Text) -> Optional[base_plugs.BasePlug]: