fix/improve tests

blueyed · Mar 17, 2020 · 04d41df · 04d41df
1 parent ca176dc
commit 04d41df
Showing 1 changed file with 8 additions and 24 deletions.
diff --git a/testing/test_config.py b/testing/test_config.py
@@ -547,11 +547,7 @@ def test_f2(): assert 0
 def test_preparse_ordering_with_setuptools(testdir, monkeypatch):
     monkeypatch.delenv("PYTEST_DISABLE_PLUGIN_AUTOLOAD", raising=False)
 
-    class EntryPoint:
-        name = "mytestplugin"
-        group = "pytest11"
-        value = None
-
+    class EntryPoint(importlib_metadata.EntryPoint):
         def load(self):
             class PseudoPlugin:
                 x = 42
@@ -560,7 +556,7 @@ class PseudoPlugin:
 
     class Dist:
         files = ()
-        entry_points = (EntryPoint(),)
+        entry_points = (EntryPoint("mytestplugin", "mytestplugin", "pytest11"),)
 
     def my_dists():
         return (Dist,)
@@ -576,18 +572,14 @@ def my_dists():
 def test_setuptools_importerror_issue1479(testdir, monkeypatch):
     monkeypatch.delenv("PYTEST_DISABLE_PLUGIN_AUTOLOAD", raising=False)
 
-    class DummyEntryPoint:
-        name = "mytestplugin"
-        group = "pytest11"
-        value = None
-
+    class EntryPoint(importlib_metadata.EntryPoint):
         def load(self):
             raise ImportError("Don't hide me!")
 
     class Distribution:
         version = "1.0"
         files = ("foo.txt",)
-        entry_points = (DummyEntryPoint(),)
+        entry_points = (EntryPoint("mytestplugin", "mytestplugin", "pytest11"),)
 
     def distributions():
         return (Distribution(),)
@@ -601,18 +593,14 @@ def test_importlib_metadata_broken_distribution(testdir, monkeypatch):
     """Integration test for broken distributions with 'files' metadata being None (#5389)"""
     monkeypatch.delenv("PYTEST_DISABLE_PLUGIN_AUTOLOAD", raising=False)
 
-    class DummyEntryPoint:
-        name = "mytestplugin"
-        group = "pytest11"
-        value = None
-
+    class EntryPoint(importlib_metadata.EntryPoint):
         def load(self):
             return object()
 
     class Distribution:
         version = "1.0"
         files = None
-        entry_points = (DummyEntryPoint(),)
+        entry_points = (EntryPoint("mytestplugin", "mytestplugin", "pytest11"),)
 
     def distributions():
         return (Distribution(),)
@@ -627,18 +615,14 @@ def test_plugin_preparse_prevents_setuptools_loading(testdir, monkeypatch, block
 
     plugin_module_placeholder = object()
 
-    class DummyEntryPoint:
-        name = "mytestplugin"
-        group = "pytest11"
-        value = None
-
+    class EntryPoint(importlib_metadata.EntryPoint):
         def load(self):
             return plugin_module_placeholder
 
     class Distribution:
         version = "1.0"
         files = ("foo.txt",)
-        entry_points = (DummyEntryPoint(),)
+        entry_points = (EntryPoint("mytestplugin", "mytestplugin", "pytest11"),)
 
     def distributions():
         return (Distribution(),)