Support exclusion rules in combinations

Like py.test we need to be able to mark certain combination
elements with exclusion rules.   Add additional logic
to pytestlplugin and exclusions so that the exclusion decorators
can be added to the combination tuples, where they will be applied
to the decorated function along with a qualifier that the test
arguments need to match what's given.

Change-Id: I15d2839954d77a252bab5aaf6e3fd9f388c99dd5

1 files changed, 4 insertions, 8 deletions

diff --git a/test/orm/test_defaults.py b/test/orm/test_defaults.py
index 9f37dbf4d..07b82b9da 100644
--- a/test/orm/test_defaults.py
+++ b/test/orm/test_defaults.py
@@ -262,14 +262,10 @@ class ComputedDefaultsOnUpdateTest(fixtures.MappedTest):
                 ),
             )
 
-    @testing.requires.computed_columns_on_update_returning
-    def test_update_computed_eager(self):
-        self._test_update_computed(True)
-
-    def test_update_computed_noneager(self):
-        self._test_update_computed(False)
-
-    def _test_update_computed(self, eager):
+    @testing.combinations(
+        (True, testing.requires.computed_columns_on_update_returning), (False,)
+    )
+    def test_update_computed(self, eager):
         if eager:
             Thing = self.classes.Thing
         else: