Merge pull request #1 from mottosso/patch-1

Consider inactive collectors
pyblish · May 30, 2016 · a865145 · a865145
2 parents fe23525 + cf60145
commit a865145
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/pyblish_qml/control.py b/pyblish_qml/control.py
@@ -672,6 +672,9 @@ def on_discover(plugins, context):
  base=pyblish.api.Collector.order):
  continue
 
+ if not plugin.active:
+ continue
+
  collectors.append(plugin)
 
  self.run(collectors, context,

diff --git a/tests/test_control.py b/tests/test_control.py
@@ -547,3 +547,32 @@ def process(self, instance):
 
  assert len(validate_actions) == 0, (
  "ValidateAction should not have had an action")
+
+
+def test_inactive_collector():
+ """An inactive collector should not run"""
+
+ count = {"#": 0}
+
+ class MyInactiveCollector(pyblish.api.ContextPlugin):
+ order = pyblish.api.CollectorOrder
+ active = False
+
+ def process(self, context):
+ print("Ran %s" % type(self))
+ count["#"] += 1
+
+ class MyActiveCollector(pyblish.api.ContextPlugin):
+ order = pyblish.api.CollectorOrder
+ active = True
+
+ def process(self, context):
+ print("Ran %s" % type(self))
+ count["#"] += 10
+
+ pyblish.api.register_plugin(MyInactiveCollector)
+ pyblish.api.register_plugin(MyActiveCollector)
+
+ reset()
+
+ assert count["#"] == 10