Commit 2733a5ff authored by Daniel Stender's avatar Daniel Stender

record new upstream branch created by importing pytest-localserver_0.3.6.orig.tar.xz and merge it

parents e099f3bf 11da9071
Metadata-Version: 1.1
Name: pytest-localserver
Version: 0.3.5
Version: 0.3.6
Summary: py.test plugin to test server connections locally.
Home-page: http://bitbucket.org/basti/pytest-localserver/
Home-page: http://bitbucket.org/pytest-dev/pytest-localserver/
Author: Sebastian Rahlf
Author-email: basti AT redtoad DOT de
License: MIT License
Download-URL: http://bitbucket.org/basti/pytest-localserver/downloads/
Download-URL: http://bitbucket.org/pytest-dev/pytest-localserver/downloads/
Description: ==================
pytest-localserver
==================
......@@ -129,7 +129,8 @@ Description: ==================
start_response(status, response_headers)
return ['Hello world!\n']
def pytest_funcarg__testserver(request):
@pytest.fixture
def testserver(request):
"""Defines the testserver funcarg"""
server = WSGIServer(application=simple_app)
server.start()
......@@ -175,7 +176,7 @@ Description: ==================
Feel free to clone the repository and add your own changes. Pull requests are
always welcome!::
hg clone https://bitbucket.org/basti/pytest-localserver
hg clone https://bitbucket.org/pytest-dev/pytest-localserver
If you find any bugs, please file a `report`_.
......@@ -201,8 +202,8 @@ Description: ==================
.. _linkchecker: http://linkchecker.sourceforge.net/
.. _WSGI application: http://www.python.org/dev/peps/pep-0333/
.. _PyPI: http://pypi.python.org/pypi/pytest-localserver/
.. _bleeding-edge archive: https://bitbucket.org/basti/pytest-localserver/get/tip.tar.gz
.. _report: https://bitbucket.org/basti/pytest-localserver/issues/
.. _bleeding-edge archive: https://bitbucket.org/pytest-dev/pytest-localserver/get/tip.tar.gz
.. _report: https://bitbucket.org/pytest-dev/pytest-localserver/issues/
.. _tox: http://testrun.org/tox/
.. _a piece of software: http://pypi.python.org/pypi/python-amazon-product-api/
.. _Mailsink recipe: http://code.activestate.com/recipes/440690/
......
......@@ -120,7 +120,8 @@ server ::
start_response(status, response_headers)
return ['Hello world!\n']
def pytest_funcarg__testserver(request):
@pytest.fixture
def testserver(request):
"""Defines the testserver funcarg"""
server = WSGIServer(application=simple_app)
server.start()
......@@ -166,7 +167,7 @@ Development and future plans
Feel free to clone the repository and add your own changes. Pull requests are
always welcome!::
hg clone https://bitbucket.org/basti/pytest-localserver
hg clone https://bitbucket.org/pytest-dev/pytest-localserver
If you find any bugs, please file a `report`_.
......@@ -192,8 +193,8 @@ I already have a couple of ideas for future versions:
.. _linkchecker: http://linkchecker.sourceforge.net/
.. _WSGI application: http://www.python.org/dev/peps/pep-0333/
.. _PyPI: http://pypi.python.org/pypi/pytest-localserver/
.. _bleeding-edge archive: https://bitbucket.org/basti/pytest-localserver/get/tip.tar.gz
.. _report: https://bitbucket.org/basti/pytest-localserver/issues/
.. _bleeding-edge archive: https://bitbucket.org/pytest-dev/pytest-localserver/get/tip.tar.gz
.. _report: https://bitbucket.org/pytest-dev/pytest-localserver/issues/
.. _tox: http://testrun.org/tox/
.. _a piece of software: http://pypi.python.org/pypi/python-amazon-product-api/
.. _Mailsink recipe: http://code.activestate.com/recipes/440690/
......
# see git-dpm(1) from git-dpm package
aeeac0f2985da0666c221b4211a6d511e8b47318
aeeac0f2985da0666c221b4211a6d511e8b47318
aeeac0f2985da0666c221b4211a6d511e8b47318
aeeac0f2985da0666c221b4211a6d511e8b47318
pytest-localserver_0.3.5.orig.tar.xz
957b075e192dc00e716ca829659d527b2993c307
16904
11da907122e2b76141462153b3cd380915480849
11da907122e2b76141462153b3cd380915480849
11da907122e2b76141462153b3cd380915480849
11da907122e2b76141462153b3cd380915480849
pytest-localserver_0.3.6.orig.tar.xz
d11cdaa5fa211f0da8bc99a436fa96fd5660eb1d
15564
debianTag="debian/%e%v"
patchedTag="patched/%e%v"
upstreamTag="upstream/%e%u"
VERSION = '0.3.5'
VERSION = '0.3.6'
......@@ -89,7 +89,7 @@ class SecureContentServer (ContentServer):
A more advanced tutorial can be found `here`_.
.. _pytest-localserver CA: https://bitbucket.org/basti/pytest-localserver/src/tip/pytest_localserver/ca.crt
.. _pytest-localserver CA: https://bitbucket.org/pytest-dev/pytest-localserver/src/tip/pytest_localserver/ca.crt
.. _pyOpenSSH: https://launchpad.net/pyopenssl
"""
......
......@@ -5,9 +5,11 @@
#
# This program is release under the MIT license. You can find the full text of
# the license in the LICENSE file.
import pytest
def pytest_funcarg__httpserver(request):
@pytest.fixture
def httpserver(request):
"""The returned ``httpserver`` provides a threaded HTTP server instance
running on a randomly assigned port on localhost. It can be taught which
content (i.e. string) to serve with which response code and comes with
......@@ -53,7 +55,8 @@ def pytest_funcarg__httpserver(request):
return server
def pytest_funcarg__httpsserver(request):
@pytest.fixture
def httpsserver(request):
"""The returned ``httpsserver`` (note the additional S!) provides a
threaded HTTP server instance similar to funcarg ``httpserver`` but with
SSL encryption.
......@@ -65,7 +68,8 @@ def pytest_funcarg__httpsserver(request):
return server
def pytest_funcarg__smtpserver(request):
@pytest.fixture
def smtpserver(request):
"""The returned ``smtpserver`` provides a threaded instance of
``smtpd.SMTPServer`` running on localhost. It has the following
attributes:
......
-----BEGIN CERTIFICATE REQUEST-----
MIIEsDCCApgCAQAwazELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUx
GzAZBgNVBAoMEnB5dGVzdC1sb2NhbHNlcnZlcjEWMBQGA1UECwwNVGVzdGluZyBE
ZXB0LjESMBAGA1UEAwwJMTI3LjAuMC4xMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
MIICCgKCAgEAv3Tux8Ca22wL+VC7eA0jeSJoqNg7TgOf3gIr8vq+WRV+lV/Kvawn
+Pmv88JLIzZX+wkK8uNoFhBVxApVhA9rZ1xeu81mu9Ux2LPCoKti73SAbf93Xu4v
QfcIOSYz438a1TymRi3I6AVSUW+YWl1V8dAsVKbKaPDdPPP4oMUSq92YvI2kBQ0S
DnzHezRpd8zh3edYG5BPpkZCTXU+lbegh9ihjzoWVzGoY9NPGOk3FBDU/AAVawmJ
Hbb6aTZz5K61fe9AY+KGl632iPSqo54YwMF/avZge/CFh40owEIu4Ow9DNpbcGm/
kOsvvlu1T9ttlPA3kxjEAUwsSAvbdSjCVTJihef4COu5/vG5wv/MV2e5dO7S7qo9
nZpN7GNPXn50wW7vAZXAX1D6EIBO7tpjW44GIDR7+sdlzcaEHXL+zcNWKBKimDov
QFQ0YEPxjO8H78FSGvWAHIzOMPx84c1TLhETDLn+IQoh0pdFYTdPkDKR+CTpQH9n
gaA6banol0B+c8/Tk0odvphv8DWlsEYK1H8o0+4EjhO7X77XX5dOApScUFulZh7U
1Qt+zqyYsUaBVX4uLIUo1wMz/lJfM4aYEwG0DwKMFzNmv6LQwMRIThurdmCRj4lv
JltpKx6Z88Wmx2eu6Tb4tQQoBQxnKdcmsDpcU13xFYOkJbzq6BZFqlcCAwEAAaAA
MA0GCSqGSIb3DQEBBQUAA4ICAQCs2Dl8wRY2KLRO/2DVhKC/Vo3Zj80edRdy5zh0
SVg1PTOgMFJ+ZTC2nuDCUjT33LcaTSZ84Hzn+IMMxqDagXTXZL4r/VPlVdSWiM4V
DAz5L3PRkvE+/qi5vDgM6Udq5E5wUHvRVGAl0fnVbH08sCk8l9tfImCT2J/DCvTn
bMfipsQFBAos9/0OghMAas8qinYvR9QgBA8yqrsai95epP/Lkp+vdj2JBRyE2l/H
LCkqNkMNau5I4sTh3gZryq6IvC/OZlWvWFhedvvMW9Z7xAUIVB/pwAdgE0bkCUoW
oiBwYu+nVosI0Wp7yVA/1IYtOjvt+6HO1CU/KmOD4AjhvQaMlPZIlbOrk+9osWPI
N7m4d89q46oV9mI8wfxsbwTlXnDfn9T85nDHn61FvnD+GV1zGx8Cfc5Ez1f0RUL6
7LBBevXPC1EdUaQpYG0oxmhVJdRBkEYNcrN+J34TqlMX1D1LUgRUrQGC59ERn8O0
kPkiExmt970ymXN1xxkX6u8XM+VRmBeDDda8VVPz+FrK9ddaIPaoMcSiXOTZqMg3
ZDP/wlzkLrEffegHcitOzeNuZGzy4A2DwNyYHKyBe6wAlInX5TKF0VoLzJ0FyB2T
qYlW1Yc7IHe0tMMG8+jC7Mo1teyKCHNYDum49kOmuuPENPztbXovI6N7ROgRgfcK
UeWiig==
-----END CERTIFICATE REQUEST-----
......@@ -2,7 +2,7 @@ from setuptools import setup, Command
import sys
VERSION = '0.3.5'
VERSION = '0.3.6'
def read(fname):
......@@ -36,8 +36,8 @@ setup(
license='MIT License',
description='py.test plugin to test server connections locally.',
long_description=read('README'),
url='http://bitbucket.org/basti/pytest-localserver/',
download_url='http://bitbucket.org/basti/pytest-localserver/downloads/',
url='http://bitbucket.org/pytest-dev/pytest-localserver/',
download_url='http://bitbucket.org/pytest-dev/pytest-localserver/downloads/',
packages=['pytest_localserver'],
install_requires=[
......
......@@ -6,10 +6,9 @@ from pytest_localserver import http, plugin
from pytest_localserver import VERSION
def pytest_funcarg__httpserver(request):
# define funcargs here again in order to run tests without having to
# install the plugin anew every single time
return plugin.pytest_funcarg__httpserver(request)
# define test fixture here again in order to run tests without having to
# install the plugin anew every single time
httpserver = plugin.httpserver
def test_httpserver_funcarg(httpserver):
......
......@@ -6,10 +6,9 @@ import requests
from pytest_localserver import https, plugin
def pytest_funcarg__httpsserver(request):
# define funcargs here again in order to run tests without having to
# install the plugin anew every single time
return plugin.pytest_funcarg__httpsserver(request)
# define test fixture here again in order to run tests without having to
# install the plugin anew every single time
httpsserver = plugin.httpsserver
def test_httpsserver_funcarg(httpsserver):
......
......@@ -28,10 +28,9 @@ def send_plain_email(to, from_, subject, txt, server=('localhost', 25)):
server.quit()
def pytest_funcarg__smtpserver(request):
# define funcargs here again in order to run tests without having to
# install the plugin anew every single time
return plugin.pytest_funcarg__smtpserver(request)
# define test fixture here again in order to run tests without having to
# install the plugin anew every single time
smtpsserver = plugin.smtpserver
def test_smtpserver_funcarg(smtpserver):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment