Added tests

Author: kevlened

Pipfile

@@ -11,10 +11,15 @@ pylint = "*"
 twine = ">=1.11.0"
 wheel = ">=0.31.0"
 setuptools = ">=39.0.1"
+tox = ">=3.0.0"
+"flake8" = ">=0.6.1"
+tox-pyenv = ">=1.1.0"
+invoke = ">=0.23.0"
 
 [requires]
 python_version = "3.6"
 
 [scripts]
-build = "python setup.py sdist bdist_wheel"
-deploy = "twine upload dist/*"
+test = "invoke test"
+build = "invoke build"
+release = "invoke release"

Pipfile.lock

@@ -6,9 +6,17 @@
 import platform
 import threading
 import collections
-import queue as Queue
 from multiprocessing import Manager, Process
 
+__version__ = '0.0.1'
+
+try:
+    # py3
+    import queue as Queue
+except Exception:
+    # py2
+    import Queue as Queue
+
 
 def parse_config(config, name):
     return getattr(config.option, name, config.getini(name))
@@ -24,8 +32,10 @@ def force(fn):
 
 
 def pytest_addoption(parser):
-    workers_help = 'Set the max num of workers (aka processes) to start (int or "auto" - one per core)'
-    tests_per_worker_help = 'Set the max num of concurrent tests for each worker (int or "auto" - split evenly)'
+    workers_help = ('Set the max num of workers (aka processes) to start '
+                    '(int or "auto" - one per core)')
+    tests_per_worker_help = ('Set the max num of concurrent tests for each '
+                             'worker (int or "auto" - split evenly)')
 
     group = parser.getgroup('pytest-parallel')
     group.addoption(
@@ -63,7 +73,7 @@ def __init__(self, queue, session):
         threading.Thread.__init__(self)
         self.queue = queue
         self.session = session
- 
+
     def run(self):
         while True:
             try:
@@ -139,7 +149,9 @@ class ParallelRunner(object):
     def __init__(self, config):
         self._manager = Manager()
         reporter = config.pluginmanager.getplugin('terminalreporter')
-        reporter.showfspath = False # prevent mangling the output
+
+        # prevent mangling the output
+        reporter.showfspath = False
 
         # get the number of workers
         workers = parse_config(config, 'workers')
@@ -155,62 +167,74 @@ def __init__(self, config):
                 print('INFO: pytest-parallel forces 1 worker on Windows')
         except ValueError:
             raise ValueError('workers can only be an integer or "auto"')
-        
+
         self.workers = workers
 
         if self.workers > 1:
             # ensure stats are process-safe
             reporter.stats = self._manager.dict()
             setdefault = reporter.stats.setdefault
+
             def setdefault_proxy(key, default=None):
                 if isinstance(default, list) and len(default) == 0:
                     default = force(lambda: self._manager.list())
                     return force(lambda: setdefault(key, default))
             reporter.stats.setdefault = setdefault_proxy
 
-
     @pytest.mark.tryfirst
     def pytest_sessionstart(self, session):
         # make the session threadsafe
         _pytest.runner.SetupState = ThreadLocalSetupState
-        
+
         # ensure that the fixtures (specifically finalizers) are threadsafe
         _pytest.fixtures.FixtureDef = ThreadLocalFixtureDef
 
         # make the environment threadsafe
         os.environ = ThreadLocalEnviron(os.environ)
 
-
     def pytest_runtestloop(self, session):
         # get the number of tests per worker
         tests_per_worker = parse_config(session.config, 'tests_per_worker')
         try:
             if tests_per_worker == 'auto':
                 tests_per_worker = 50
             if tests_per_worker:
-                tests_per_worker = min(int(tests_per_worker), math.ceil(len(session.items)/self.workers))
+                tests_per_worker = int(tests_per_worker)
+                evenly_divided = math.ceil(len(session.items)/self.workers)
+                tests_per_worker = min(tests_per_worker, evenly_divided)
             else:
                 tests_per_worker = 1
         except ValueError:
-            raise ValueError('tests_per_worker can only be an integer or "auto"')
+            raise ValueError(('tests_per_worker can only be '
+                              'an integer or "auto"'))
 
-        worker_noun = 'workers' if self.workers > 1 else 'worker'
-        test_noun = 'tests' if tests_per_worker > 1 else 'test'
-        print('pytest-parallel: {} {} (processes), {} {} per worker (threads)'
-            .format(self.workers, worker_noun, tests_per_worker, test_noun))
+        if self.workers > 1:
+            worker_noun, process_noun = ('workers', 'processes')
+        else:
+            worker_noun, process_noun = ('worker', 'process')
+
+        if tests_per_worker > 1:
+            test_noun, thread_noun = ('tests', 'threads')
+        else:
+            test_noun, thread_noun = ('test', 'thread')
+
+        print('pytest-parallel: {} {} ({}), {} {} per worker ({})'
+              .format(self.workers, worker_noun, process_noun,
+                      tests_per_worker, test_noun, thread_noun))
 
         queue = Queue.Queue() if self.workers == 1 else self._manager.Queue()
 
         for i in range(len(session.items)):
             queue.put(i)
-        
+
         if self.workers == 1:
             process_with_threads(queue, session, tests_per_worker)
             return True
 
         processes = []
         for _ in range(self.workers):
-            process = Process(target=process_with_threads, args=(queue, session, tests_per_worker))
+            process = Process(target=process_with_threads,
+                              args=(queue, session, tests_per_worker))
             process.start()
             processes.append(process)
         [p.join() for p in processes]

pytest-parallel/__init__.py renamed to pytest_parallel/__init__.py

@@ -1,16 +1,21 @@
-from setuptools import setup, find_packages
+from setuptools import setup
 from codecs import open
 from os import path
+import re
 
 here = path.abspath(path.dirname(__file__))
 
 # Get the long description from the README file
 with open(path.join(here, 'README.md'), encoding='utf-8') as f:
     long_description = f.read()
 
+# Get the version from the module
+with open(path.join('pytest_parallel', '__init__.py'), encoding='utf-8') as f:
+    version = re.search(r'__version__ = \'(.*?)\'', f.read()).group(1)
+
 setup(
     name='pytest-parallel',
-    version='0.0.1',
+    version=version,
     license='MIT',
     description='a py.test plugin for parallel and concurrent testing',
     long_description=long_description,
@@ -19,6 +24,14 @@
     author='Browsertron',
     author_email='[email protected]',
 
+    install_requires=['pytest>=3.0.0'],
+    packages=['pytest_parallel'],
+    entry_points={
+        'pytest11': [
+            'parallel = pytest_parallel',
+        ]
+    },
+
     # For a list of valid classifiers, see https://pypi.org/classifiers/
     classifiers=[
         'Development Status :: 3 - Alpha',
@@ -36,7 +49,4 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.6',
     ],
-
-    packages=find_packages(),
-    install_requires=['pytest>=3.0.0'],
 )

setup.py

@@ -0,0 +1,28 @@
+from invoke import task
+from codecs import open
+from os import path
+import re
+
+with open(path.join('pytest_parallel', '__init__.py'), encoding='utf-8') as f:
+    version = re.search(r'__version__ = \'(.*?)\'', f.read()).group(1)
+
+
+@task
+def test(c):
+    c.run('tox')
+
+
+@task
+def build(c):
+    c.run('python setup.py sdist bdist_wheel')
+
+
+@task
+def release(c):
+    test(c)
+    build(c)
+    c.run('git commit -am {}'.format(version))
+    c.run('git tag {}'.format(version))
+    c.run('git push')
+    c.run('git push --tags')
+    c.run('twine upload dist/*')

tasks.py

@@ -0,0 +1 @@
+pytest_plugins = ['pytester']

tests/conftest.py

@@ -0,0 +1,39 @@
+def test_concurrent_fixture(testdir):
+    testdir.makepyfile("""
+        import pytest
+        import time
+        from six import print_
+
+        @pytest.fixture
+        def driver(request):
+            fn_name = request.function.__name__
+            print_('before sleep', fn_name)
+            time.sleep(.1)
+            print_('after sleep', fn_name)
+            def after():
+                print_('after test', fn_name)
+            request.addfinalizer(after)
+
+        def test_0(driver):
+            print_('inside test_0')
+            time.sleep(.1)
+
+        def test_1(driver):
+            print_('inside test_1')
+    """)
+    result = testdir.runpytest(
+      '-s',
+      '--tests-per-worker=2'
+    )
+    result.stdout.fnmatch_lines([
+        'pytest-parallel: 1 worker (process), 2 tests per worker (threads)',
+        '*before sleep test_0',
+        '*before sleep test_1',
+        '*after sleep test_0',
+        '*inside test_0',
+        '*after sleep test_1',
+        '*inside test_1',
+        '*after test test_1',
+        '*after test test_0'
+    ])
+    result.assert_outcomes(passed=2)