Merge pull request #907 from nicoddemus/regendocs-fixture

Use smtp.gmail.com server for examples and fixes examples for python 3
This commit is contained in:
Ronny Pfannschmidt 2015-07-31 06:55:08 +02:00
commit f6506fa6ca
1 changed files with 11 additions and 11 deletions

View File

@ -62,7 +62,7 @@ using it::
@pytest.fixture @pytest.fixture
def smtp(): def smtp():
import smtplib import smtplib
return smtplib.SMTP("merlinux.eu") return smtplib.SMTP("smtp.gmail.com")
def test_ehlo(smtp): def test_ehlo(smtp):
response, msg = smtp.ehlo() response, msg = smtp.ehlo()
@ -169,7 +169,7 @@ access the fixture function::
@pytest.fixture(scope="module") @pytest.fixture(scope="module")
def smtp(): def smtp():
return smtplib.SMTP("merlinux.eu") return smtplib.SMTP("smtp.gmail.com")
The name of the fixture again is ``smtp`` and you can access its result by The name of the fixture again is ``smtp`` and you can access its result by
listing the name ``smtp`` as an input parameter in any test or fixture listing the name ``smtp`` as an input parameter in any test or fixture
@ -178,14 +178,14 @@ function (in or below the directory where ``conftest.py`` is located)::
# content of test_module.py # content of test_module.py
def test_ehlo(smtp): def test_ehlo(smtp):
response = smtp.ehlo() response, msg = smtp.ehlo()
assert response[0] == 250 assert response == 250
assert "merlinux" in response[1] assert "smtp.gmail.com" in str(msg, 'ascii')
assert 0 # for demo purposes assert 0 # for demo purposes
def test_noop(smtp): def test_noop(smtp):
response = smtp.noop() response, msg = smtp.noop()
assert response[0] == 250 assert response == 250
assert 0 # for demo purposes assert 0 # for demo purposes
We deliberately insert failing ``assert 0`` statements in order to We deliberately insert failing ``assert 0`` statements in order to
@ -255,7 +255,7 @@ or multiple times::
@pytest.fixture(scope="module") @pytest.fixture(scope="module")
def smtp(request): def smtp(request):
smtp = smtplib.SMTP("merlinux.eu") smtp = smtplib.SMTP("smtp.gmail.com")
def fin(): def fin():
print ("teardown smtp") print ("teardown smtp")
smtp.close() smtp.close()
@ -296,7 +296,7 @@ read an optional server URL from the test module which uses our fixture::
@pytest.fixture(scope="module") @pytest.fixture(scope="module")
def smtp(request): def smtp(request):
server = getattr(request.module, "smtpserver", "merlinux.eu") server = getattr(request.module, "smtpserver", "smtp.gmail.com")
smtp = smtplib.SMTP(server) smtp = smtplib.SMTP(server)
def fin(): def fin():
@ -359,7 +359,7 @@ through the special :py:class:`request <FixtureRequest>` object::
import smtplib import smtplib
@pytest.fixture(scope="module", @pytest.fixture(scope="module",
params=["merlinux.eu", "mail.python.org"]) params=["smtp.gmail.com", "mail.python.org"])
def smtp(request): def smtp(request):
smtp = smtplib.SMTP(request.param) smtp = smtplib.SMTP(request.param)
def fin(): def fin():
@ -431,7 +431,7 @@ connection the second test fails in ``test_ehlo`` because a
different server string is expected than what arrived. different server string is expected than what arrived.
pytest will build a string that is the test ID for each fixture value pytest will build a string that is the test ID for each fixture value
in a parametrized fixture, e.g. ``test_ehlo[merlinux.eu]`` and in a parametrized fixture, e.g. ``test_ehlo[smtp.gmail.com]`` and
``test_ehlo[mail.python.org]`` in the above examples. These IDs can ``test_ehlo[mail.python.org]`` in the above examples. These IDs can
be used with ``-k`` to select specific cases to run, and they will be used with ``-k`` to select specific cases to run, and they will
also identify the specific case when one is failing. Running pytest also identify the specific case when one is failing. Running pytest