tidy up plugins

Author: jmatthews

pytest-fixture-config/MANIFEST.in

@@ -0,0 +1 @@
+recursive-include tests *

pytest-fixture-config/setup.cfg

@@ -2,7 +2,7 @@
 # This adds the 'dev' marker to versions.
 # This must conform to PEP-386:
 # http://www.python.org/dev/peps/pep-0386/#the-new-versioning-algorithm
-tag_build = .dev1
+#tag_build = .dev1
 
 [upload_docs]
 upload-dir = build/sphinx/html

pytest-fixture-config/setup.py

@@ -1,7 +1,7 @@
 import sys
 import logging
 
-from setuptools import setup, find_packages
+from setuptools import setup
 from setuptools.command.test import test as TestCommand
 
 classifiers = [

pytest-listener/MANIFEST.in

@@ -0,0 +1 @@
+recursive-include tests *

pytest-listener/setup.py

@@ -21,6 +21,7 @@
 
 pytest_args = []
 
+
 class PyTest(TestCommand):
 
     def initialize_options(self):
@@ -38,10 +39,10 @@ def run_tests(self):
         import pytest
 
         pytest_args.extend(['--cov', 'pytest_listener',
-                     '--cov-report', 'xml',
-                     '--cov-report', 'html',
-                     '--junitxml', 'junit.xml',
-                     ])
+                            '--cov-report', 'xml',
+                            '--cov-report', 'html',
+                            '--junitxml', 'junit.xml',
+                            ])
         errno = pytest.main(pytest_args)
         sys.exit(errno)
 

pytest-profiling/MANIFEST.in

@@ -0,0 +1 @@
+recursive-include tests *

pytest-profiling/setup.cfg

@@ -2,7 +2,7 @@
 # This adds the 'dev' marker to versions.
 # This must conform to PEP-386:
 # http://www.python.org/dev/peps/pep-0386/#the-new-versioning-algorithm
-tag_build = .dev1
+#tag_build = .dev1
 
 [upload_docs]
 upload-dir = build/sphinx/html

pytest-pyramid-server/MANIFEST.in

@@ -0,0 +1 @@
+recursive-include tests *

pytest-pyramid-server/pyramid_server_test.py

@@ -0,0 +1,12 @@
+#
+# Entrance point for the integration tests
+#
+from pyramid.response import Response
+from pyramid.config import Configurator
+
+
+def main(global_config, **settings):
+    config = Configurator(settings=settings,)
+    config.add_route('home', 'test')
+    config.add_view(lambda request: Response('OK'), route_name='home')
+    return config.make_wsgi_app()

pytest-pyramid-server/pytest_pyramid_server.py

@@ -100,7 +100,7 @@ def pre_setup(self):
         parser.set('server:main', 'port', self.port)
         parser.set('server:main', 'host', self.hostname)
         [parser.set(section, k, v) for section, cfg in self.extra_config_vars.items() for (k, v) in cfg.items()]
-        with self.working_config.open('w') as fp:
+        with open(str(self.working_config), 'w') as fp:
             parser.write(fp)
 
         # Set the uri to be the external hostname and the url prefix

pytest-pyramid-server/setup.cfg

@@ -2,7 +2,7 @@
 # This adds the 'dev' marker to versions.
 # This must conform to PEP-386:
 # http://www.python.org/dev/peps/pep-0386/#the-new-versioning-algorithm
-tag_build = .dev1
+#tag_build = .dev1
 
 [upload_docs]
 upload-dir = build/sphinx/html

pytest-pyramid-server/setup.py

@@ -1,7 +1,7 @@
 import sys
 import logging
 
-from setuptools import setup, find_packages
+from setuptools import setup
 from setuptools.command.test import test as TestCommand
 
 classifiers = [
@@ -22,6 +22,7 @@
 
 pytest_args = []
 
+
 class PyTest(TestCommand):
 
     def initialize_options(self):
@@ -39,10 +40,10 @@ def run_tests(self):
         import pytest
 
         pytest_args.extend(['--cov', 'pytest_pyramid_server',
-                     '--cov-report', 'xml',
-                     '--cov-report', 'html',
-                     '--junitxml', 'junit.xml',
-                     ])
+                            '--cov-report', 'xml',
+                            '--cov-report', 'html',
+                            '--junitxml', 'junit.xml',
+                            ])
         errno = pytest.main(pytest_args)
         sys.exit(errno)
 
@@ -61,14 +62,18 @@ def main():
                         ]
 
     tests_require = ['pytest-cov',
-                     'mock'
+                     'pyramid-debugtoolbar',
                      ]
 
     entry_points = {
         'pytest11': [
             'pyramid_server = pytest_pyramid_server',
-        ]
+        ],
+        'paste.app_factory': [
+            'pyramid_server_test = pyramid_server_test:main',
+        ],
     }
+    
 
     setup(
         name='pytest-pyramid-server',
@@ -84,7 +89,7 @@ def main():
         install_requires=install_requires,
         tests_require=tests_require,
         cmdclass={'test': PyTest},
-        py_modules=['pytest_pyramid_server'],
+        py_modules=['pytest_pyramid_server', 'pyramid_server_test'],
         entry_points=entry_points,
     )
 

pytest-pyramid-server/tests/integration/config/testing.ini

@@ -0,0 +1,6 @@
+[app:main]
+use = egg:pytest-pyramid-server#pyramid_server_test
+url_prefix = test
+
+[server:main]
+use = egg:waitress#main

pytest-pyramid-server/tests/integration/test_pyramid_server.py

@@ -0,0 +1,13 @@
+import os
+
+from pytest_pyramid_server import InlinePyramidTestServer
+
+CONFIG_DIR = os.path.dirname(__file__) + '/config'
+
+
+def test_InlinePyramidTestServer():
+    ipts = InlinePyramidTestServer(config_dir=CONFIG_DIR)
+    ipts.start()
+    assert ipts.check_server_up()
+    ipts.kill()
+    assert not ipts.check_server_up()

pytest-qt-app/MANIFEST.in

@@ -0,0 +1 @@
+recursive-include tests *

pytest-qt-app/setup.cfg

@@ -2,7 +2,7 @@
 # This adds the 'dev' marker to versions.
 # This must conform to PEP-386:
 # http://www.python.org/dev/peps/pep-0386/#the-new-versioning-algorithm
-tag_build = .dev1
+#tag_build = .dev1
 
 [upload_docs]
 upload-dir = build/sphinx/html

pytest-qt-app/setup.py

@@ -65,7 +65,7 @@ def main():
 
     entry_points = {
         'pytest11': [
-            'qt = pytest_qt',
+            'qt = pytest_qt_app',
         ]
     }
 

pytest-server-fixtures/MANIFEST.in

@@ -0,0 +1 @@
+recursive-include tests *

pytest-server-fixtures/pytest_server_fixtures/jenkins.py

@@ -8,11 +8,6 @@
 import os.path
 import shutil
 
-try:
-    import jenkins
-except ImportError:
-    pass
-
 import pytest
 
 from pytest_server_fixtures import CONFIG
@@ -24,8 +19,8 @@
 @yield_requires_config(CONFIG, ['jenkins_war', 'java_executable'])
 @pytest.yield_fixture(scope='session')
 def jenkins_server():
-    """ Session-scoped Jenkins server instance 
-    
+    """ Session-scoped Jenkins server instance
+
         Attributes
         ----------
         api (`jenkins.Jenkins`)  : python-jenkins client API connected to this server
@@ -41,6 +36,8 @@ class JenkinsTestServer(HTTPTestServer):
     kill_retry_delay = 2
 
     def __init__(self, **kwargs):
+        global jenkins
+        import jenkins
         super(JenkinsTestServer, self).__init__(**kwargs)
         self.env = dict(JENKINS_ROOT='/usr/share/jenkins',
                         JENKINS_HOME=self.workspace,
@@ -75,7 +72,7 @@ def load_plugins(self, plugins_repo, plugins=None):
 
         # copy the plugins to the jenkins plugin directory
         available_plugins = dict(((os.path.splitext(os.path.basename(x))[0], os.path.join(plugins_repo, x))
-                       for x in os.listdir(plugins_repo) if x.endswith('.hpi')))
+                                  for x in os.listdir(plugins_repo) if x.endswith('.hpi')))
 
         if plugins is None:
             plugins = available_plugins.keys()

pytest-server-fixtures/pytest_server_fixtures/mongo.py

@@ -5,12 +5,6 @@
 
 import pytest
 
-try:
-    import pymongo
-    from pymongo.errors import AutoReconnect, ConnectionFailure
-except ImportError:
-    pass
-
 from pytest_server_fixtures import CONFIG
 from pytest_fixture_config import requires_config
 
@@ -36,11 +30,11 @@ def mongo_server(request):
 
         For completeness, we tidy up any outstanding mongo temp directories
         at the start and end of each test session
-        
+
         Attributes
         ----------
         api (`pymongo.MongoClient`)  : PyMongo Client API connected to this server
-        .. also inherits all attributes from the `workspace` fixture 
+        .. also inherits all attributes from the `workspace` fixture
     """
     return _mongo_server(request)
 
@@ -68,6 +62,8 @@ class MongoTestServer(TestServer):
     random_port = True
 
     def __init__(self, **kwargs):
+        global pymongo
+        import pymongo
         mongod_dir = tempfile.mkdtemp(dir=self.get_base_dir())
         super(MongoTestServer, self).__init__(workspace=mongod_dir, delete=True, **kwargs)
 
@@ -85,25 +81,25 @@ def get_base_dir():
     @property
     def run_cmd(self):
         return ['%s/mongod' % CONFIG.mongo_bin,
-                    '--bind_ip=%s' % self.hostname,
-                    '--port=%s' % self.port,
-                    '--dbpath=%s' % self.workspace,
-                    '--nounixsocket',
-                    '--smallfiles',
-                    '--syncdelay', '0',
-                    '--nohttpinterface',
-                    '--nssize=1',
-                    '--nojournal',
-                    '--quiet',
-        ]
+                '--bind_ip=%s' % self.hostname,
+                '--port=%s' % self.port,
+                '--dbpath=%s' % self.workspace,
+                '--nounixsocket',
+                '--smallfiles',
+                '--syncdelay', '0',
+                '--nohttpinterface',
+                '--nssize=1',
+                '--nojournal',
+                '--quiet',
+                ]
 
     def check_server_up(self):
         """Test connection to the server."""
         print("Connecting to Mongo at %s:%s" % (self.hostname, self.port))
         try:
             self.api = pymongo.MongoClient(self.hostname, self.port)
             return True
-        except (AutoReconnect, ConnectionFailure) as e:
+        except (pymongo.AutoReconnect, pymongo.ConnectionFailure) as e:
             print(e)
         return False
 

pytest-server-fixtures/pytest_server_fixtures/redis.py

@@ -8,10 +8,6 @@
 import socket
 
 import pytest
-try:
-    import redis
-except ImportError:
-    pass
 
 from pytest_server_fixtures import CONFIG
 from pytest_fixture_config import requires_config
@@ -33,19 +29,19 @@ def _redis_server(request):
 @pytest.fixture(scope='function')
 def redis_server(request):
     """ Function-scoped Redis server in a local thread.
-    
+
         Attributes
         ----------
-        api: (``redis.Redis``)   Redis client API connected to this server 
-        .. also inherits all attributes from the `workspace` fixture 
+        api: (``redis.Redis``)   Redis client API connected to this server
+        .. also inherits all attributes from the `workspace` fixture
     """
     return _redis_server(request)
 
 
 @requires_config(CONFIG, ['redis_executable'])
 @pytest.fixture(scope='session')
 def redis_server_sess(request):
-    """ Same as redis_server fixture, scoped for test session 
+    """ Same as redis_server fixture, scoped for test session
     """
     return _redis_server(request)
 
@@ -57,6 +53,8 @@ class RedisTestServer(TestServer):
     port_seed = 65532
 
     def __init__(self, db=0, **kwargs):
+        global redis
+        import redis
         self.db = db
         super(RedisTestServer, self).__init__(**kwargs)
         self.api = redis.Redis(host=self.hostname, port=self.port, db=self.db)