Merge pull request #29 from nodev-io/marker-interface

Add marker interface to enable search. Closes #28.

Author: alexamici

pytest_nodev/__init__.py

@@ -2,20 +2,3 @@
 #
 # Copyright (c) 2015-2016 Alessandro Amici
 #
-
-# python 2 support via python-future
-from __future__ import absolute_import, unicode_literals
-
-import inspect
-
-
-def search(target_name):
-    def wish_decorator(test_func):
-        def wish_wrapper(wish, monkeypatch, *args, **kwargs):
-            if '.' in target_name:
-                monkeypatch.setattr(target_name, wish, raising=False)
-            else:
-                monkeypatch.setattr(inspect.getmodule(test_func), target_name, wish, raising=False)
-            return test_func(*args, **kwargs)
-        return wish_wrapper
-    return wish_decorator

pytest_nodev/plugin.py

@@ -26,6 +26,7 @@
 from builtins import dict, list, zip
 
 import collections
+import inspect
 import logging
 import os
 import sys
@@ -113,6 +114,22 @@ def make_wish_index(config):
     return config._wish_index_items
 
 
+def pytest_pycollect_makeitem(collector, name, obj):
+    search_marker = getattr(obj, 'search', None)
+    if search_marker and getattr(search_marker, 'args', []):
+        target_name = search_marker.args[0]
+
+        def wrapper(wish, monkeypatch, *args, **kwargs):
+            if '.' in target_name:
+                monkeypatch.setattr(target_name, wish, raising=False)
+            else:
+                monkeypatch.setattr(inspect.getmodule(obj), target_name, wish, raising=False)
+            return obj(*args, **kwargs)
+
+        wrapper.__dict__ = obj.__dict__
+        return list(collector._genfunctions(name, wrapper))
+
+
 def pytest_generate_tests(metafunc):
     if 'wish' not in metafunc.fixturenames:
         return

specs/test_object_from_name.py

@@ -1,18 +1,18 @@
 
 import os
 
-import pytest_nodev
+import pytest
 
 
-@pytest_nodev.search('object_from_name')
+@pytest.mark.search('object_from_name')
 def test_object_from_name_simple():
     assert object_from_name('os:O_CREAT') is os.O_CREAT
     assert object_from_name('os.path:join') is os.path.join
     assert object_from_name('builtins:True') is True
     assert object_from_name('builtins:open') is open
 
 
-@pytest_nodev.search('object_from_name')
+@pytest.mark.search('object_from_name')
 def test_object_from_name_pep3155():
     # instance methods compare by equality, see http://stackoverflow.com/questions/15977808
     assert object_from_name('os:O_CREAT.bit_length') == os.O_CREAT.bit_length

tests/test_plugin.py

@@ -22,8 +22,10 @@ def test_factorial(wish):
     assert factorial(21) == 51090942171709440000
 '''
 TEST_POW_PY = '''
-def test_pow(wish):
-    assert wish(2, 9, 47) == 42
+import pytest
+@pytest.mark.search('pow')
+def test_pow():
+    assert pow(2, 9, 47) == 42
 '''