Fix pyramid/pgwui testing usage

diff --git a/setup.py b/setup.py
index 9141c01f56538c76c69aa47979df3e97212407f6..7c87d9d772d63efcdbdc21bb17f5248cd29d3b21 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -59,6 +59,7 @@ long_description = filter_readme()
 
 # Pyramid testing requirements
 tests_require = [
+    'pgwui_testing==' + version,
     'WebTest >= 1.3.1',  # py3 compat
     'pytest>=3.7.4',
     'pytest-cov',

diff --git a/tests/test___init__.py b/tests/test___init__.py
index aa06b9963b64118ff94246b5071b5cc516f50675..2dd7cec3eb5e7b27671a9c6f612d75035ca3116c 100644 (file)
--- a/tests/test___init__.py
+++ b/tests/test___init__.py
@@ -20,25 +20,11 @@
 # Karl O. Pinc <kop@meme.com>
 
 import pyramid.config
-import pyramid.testing
 import pyramid.threadlocal
-import pytest
 import pgwui_common.__init__ as pgwui_common_init
 
-
-# Fixtures
-
-@pytest.fixture
-def pyramid_config():
-    yield pyramid.testing.setUp()
-    pyramid.testing.tearDown()
-
-
-@pytest.fixture
-def pyramid_request_config():
-    request = pyramid.testing.DummyRequest()
-    yield pyramid.testing.setUp(request=request)
-    pyramid.testing.tearDown()
+# Activiate our pytest plugin
+pytest_plugins = ("pgwui",)
 
 
 # Unit tests