Commits

holger krekel committed c27a600

final touches

Comments (0)

Files changed (19)

 	-rm -rf $(BUILDDIR)/*
 
 install: html
-	 rsync -avz _build/html/ pytest.org:/www/pytest.org/dev
+	 rsync -avz _build/html/ pytest.org:/www/pytest.org/latest
 
 installpdf: latexpdf
-	@scp $(BUILDDIR)/latex/pytest.pdf pytest.org:/www/pytest.org/dev
+	@scp $(BUILDDIR)/latex/pytest.pdf pytest.org:/www/pytest.org/latest
 
 installall: clean install installpdf
 	@echo "done"

doc/en/announce/release-2.3.0.txt

 to run your test suites and 3rd party plugins that worked with
 pytest-2.2.4.
 
-If you are interested in the precise reasoning of the pytest-2.3 fixture
-evolution, please consult http://pytest.org/latest/funcarg_compare.html
+If you are interested in the precise reasoning (including examples) of the 
+pytest-2.3 fixture evolution, please consult
+http://pytest.org/latest/funcarg_compare.html
 
 For general info on installation and getting started:
 

doc/en/capture.txt

     
     test_module.py:9: AssertionError
     ----------------------------- Captured stdout ------------------------------
-    setting up <function test_func2 at 0x1443140>
+    setting up <function test_func2 at 0x2d98050>
     ==================== 1 failed, 1 passed in 0.01 seconds ====================
 
 Accessing captured output from a test function

doc/en/doctest.txt

     
     mymodule.py .
     
-    ========================= 1 passed in 0.04 seconds =========================
+    ========================= 1 passed in 0.02 seconds =========================

doc/en/example/attic_remoteinterpreter.txt

         self._conftestpath2mod[conftestpath] = mod = conftestpath.pyimport()
       File "/home/hpk/p/pytest/.tox/regen/local/lib/python2.7/site-packages/py/_path/local.py", line 532, in pyimport
         __import__(modname)
-      File "/tmp/doc-exec-172/conftest.py", line 2, in <module>
+      File "/tmp/doc-exec-286/conftest.py", line 2, in <module>
         from .remoteinterpreter import RemoteInterpreter
     ValueError: Attempted relative import in non-package
 
         self._conftestpath2mod[conftestpath] = mod = conftestpath.pyimport()
       File "/home/hpk/p/pytest/.tox/regen/local/lib/python2.7/site-packages/py/_path/local.py", line 532, in pyimport
         __import__(modname)
-      File "/tmp/doc-exec-172/conftest.py", line 2, in <module>
+      File "/tmp/doc-exec-286/conftest.py", line 2, in <module>
         from myapp import MyApp
     ImportError: No module named myapp
 

doc/en/example/index.txt

 Here is a (growing) list of examples. :ref:`Contact <contact>` us if you
 need more examples or have questions. Also take a look at the :ref:`comprehensive documentation <toc>` which contains many example snippets as well.
 
+Also, `pytest on stackoverflow.com <http://stackoverflow.com/search?q=pytest>`_ 
+is a primary continously updated source of pytest questions and answers
+which often contain examples.  New Questions will usually be seen 
+by pytest users or developers. 
+
 .. note::
 
    see :doc:`../getting-started` for basic introductory examples

doc/en/example/markers.txt

     
     test_someenv.py .
     
-    ========================= 1 passed in 0.00 seconds =========================
+    ========================= 1 passed in 0.01 seconds =========================
 
 The ``--markers`` option always gives you a list of available markers::
 
     
     test_plat.py s.s.
     ========================= short test summary info ==========================
-    SKIP [2] /tmp/doc-exec-174/conftest.py:12: cannot run on platform linux2
+    SKIP [2] /tmp/doc-exec-288/conftest.py:12: cannot run on platform linux2
     
     =================== 2 passed, 2 skipped in 0.01 seconds ====================
 

doc/en/example/nonpython.txt

       <YamlItem 'ok'>
       <YamlItem 'hello'>
     
-    =============================  in 0.02 seconds =============================
+    =============================  in 0.03 seconds =============================

doc/en/example/parametrize.txt

     ================================= FAILURES =================================
     _________________________ test_db_initialized[d2] __________________________
     
-    db = <conftest.DB2 instance at 0x1c31878>
+    db = <conftest.DB2 instance at 0x2928878>
     
         def test_db_initialized(db):
             # a dummy test
     ================================= FAILURES =================================
     ________________________ TestClass.test_equals[1-2] ________________________
     
-    self = <test_parametrize.TestClass instance at 0x203c4d0>, a = 1, b = 2
+    self = <test_parametrize.TestClass instance at 0x18dd4d0>, a = 1, b = 2
     
         def test_equals(self, a, b):
     >       assert a == b

doc/en/example/pythoncollection.txt

           <Function 'check_simple'>
           <Function 'check_complex'>
     
-    =============================  in 0.01 seconds =============================
+    =============================  in 0.00 seconds =============================
 
 Interpreting cmdline arguments as Python packages
 -----------------------------------------------------

doc/en/example/reportingdemo.txt

     failure_demo.py:15: AssertionError
     _________________________ TestFailing.test_simple __________________________
     
-    self = <failure_demo.TestFailing object at 0x16ce7d0>
+    self = <failure_demo.TestFailing object at 0x2727750>
     
         def test_simple(self):
             def f():
         
     >       assert f() == g()
     E       assert 42 == 43
-    E        +  where 42 = <function f at 0x1668410>()
-    E        +  and   43 = <function g at 0x1668488>()
+    E        +  where 42 = <function f at 0x26cf488>()
+    E        +  and   43 = <function g at 0x26cf500>()
     
     failure_demo.py:28: AssertionError
     ____________________ TestFailing.test_simple_multiline _____________________
     
-    self = <failure_demo.TestFailing object at 0x16ce850>
+    self = <failure_demo.TestFailing object at 0x27277d0>
     
         def test_simple_multiline(self):
             otherfunc_multi(
     failure_demo.py:11: AssertionError
     ___________________________ TestFailing.test_not ___________________________
     
-    self = <failure_demo.TestFailing object at 0x16ce350>
+    self = <failure_demo.TestFailing object at 0x2727890>
     
         def test_not(self):
             def f():
                 return 42
     >       assert not f()
     E       assert not 42
-    E        +  where 42 = <function f at 0x1668758>()
+    E        +  where 42 = <function f at 0x26cf7d0>()
     
     failure_demo.py:38: AssertionError
     _________________ TestSpecialisedExplanations.test_eq_text _________________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x16ceb90>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x2727c10>
     
         def test_eq_text(self):
     >       assert 'spam' == 'eggs'
     failure_demo.py:42: AssertionError
     _____________ TestSpecialisedExplanations.test_eq_similar_text _____________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x1677190>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x26d1110>
     
         def test_eq_similar_text(self):
     >       assert 'foo 1 bar' == 'foo 2 bar'
     failure_demo.py:45: AssertionError
     ____________ TestSpecialisedExplanations.test_eq_multiline_text ____________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x1677210>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x26d1190>
     
         def test_eq_multiline_text(self):
     >       assert 'foo\nspam\nbar' == 'foo\neggs\nbar'
     failure_demo.py:48: AssertionError
     ______________ TestSpecialisedExplanations.test_eq_long_text _______________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x1677c50>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x26d1090>
     
         def test_eq_long_text(self):
             a = '1'*100 + 'a' + '2'*100
     failure_demo.py:53: AssertionError
     _________ TestSpecialisedExplanations.test_eq_long_text_multiline __________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x166ef10>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x26c7ed0>
     
         def test_eq_long_text_multiline(self):
             a = '1\n'*100 + 'a' + '2\n'*100
     failure_demo.py:58: AssertionError
     _________________ TestSpecialisedExplanations.test_eq_list _________________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x166e210>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x26c7190>
     
         def test_eq_list(self):
     >       assert [0, 1, 2] == [0, 1, 3]
     failure_demo.py:61: AssertionError
     ______________ TestSpecialisedExplanations.test_eq_list_long _______________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x166e490>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x26c7410>
     
         def test_eq_list_long(self):
             a = [0]*100 + [1] + [3]*100
     failure_demo.py:66: AssertionError
     _________________ TestSpecialisedExplanations.test_eq_dict _________________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x166ebd0>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x26c78d0>
     
         def test_eq_dict(self):
     >       assert {'a': 0, 'b': 1} == {'a': 0, 'b': 2}
     failure_demo.py:69: AssertionError
     _________________ TestSpecialisedExplanations.test_eq_set __________________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x166e850>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x26c7690>
     
         def test_eq_set(self):
     >       assert set([0, 10, 11, 12]) == set([0, 20, 21])
     failure_demo.py:72: AssertionError
     _____________ TestSpecialisedExplanations.test_eq_longer_list ______________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x166e590>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x26c7510>
     
         def test_eq_longer_list(self):
     >       assert [1,2] == [1,2,3]
     failure_demo.py:75: AssertionError
     _________________ TestSpecialisedExplanations.test_in_list _________________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x166a0d0>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x26c3190>
     
         def test_in_list(self):
     >       assert 1 in [0, 2, 3, 4, 5]
     failure_demo.py:78: AssertionError
     __________ TestSpecialisedExplanations.test_not_in_text_multiline __________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x166a9d0>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x26c3d10>
     
         def test_not_in_text_multiline(self):
             text = 'some multiline\ntext\nwhich\nincludes foo\nand a\ntail'
     failure_demo.py:82: AssertionError
     ___________ TestSpecialisedExplanations.test_not_in_text_single ____________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x166af50>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x26c3d50>
     
         def test_not_in_text_single(self):
             text = 'single foo line'
     failure_demo.py:86: AssertionError
     _________ TestSpecialisedExplanations.test_not_in_text_single_long _________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x166a810>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x26c3790>
     
         def test_not_in_text_single_long(self):
             text = 'head ' * 50 + 'foo ' + 'tail ' * 20
     failure_demo.py:90: AssertionError
     ______ TestSpecialisedExplanations.test_not_in_text_single_long_term _______
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x166a210>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x26c3150>
     
         def test_not_in_text_single_long_term(self):
             text = 'head ' * 50 + 'f'*70 + 'tail ' * 20
             i = Foo()
     >       assert i.b == 2
     E       assert 1 == 2
-    E        +  where 1 = <failure_demo.Foo object at 0x166a8d0>.b
+    E        +  where 1 = <failure_demo.Foo object at 0x26c3850>.b
     
     failure_demo.py:101: AssertionError
     _________________________ test_attribute_instance __________________________
                 b = 1
     >       assert Foo().b == 2
     E       assert 1 == 2
-    E        +  where 1 = <failure_demo.Foo object at 0x166ab90>.b
-    E        +    where <failure_demo.Foo object at 0x166ab90> = <class 'failure_demo.Foo'>()
+    E        +  where 1 = <failure_demo.Foo object at 0x26c39d0>.b
+    E        +    where <failure_demo.Foo object at 0x26c39d0> = <class 'failure_demo.Foo'>()
     
     failure_demo.py:107: AssertionError
     __________________________ test_attribute_failure __________________________
     failure_demo.py:116: 
     _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 
     
-    self = <failure_demo.Foo object at 0x1837890>
+    self = <failure_demo.Foo object at 0x2890810>
     
         def _get_b(self):
     >       raise Exception('Failed to get attrib')
                 b = 2
     >       assert Foo().b == Bar().b
     E       assert 1 == 2
-    E        +  where 1 = <failure_demo.Foo object at 0x166aad0>.b
-    E        +    where <failure_demo.Foo object at 0x166aad0> = <class 'failure_demo.Foo'>()
-    E        +  and   2 = <failure_demo.Bar object at 0x166acd0>.b
-    E        +    where <failure_demo.Bar object at 0x166acd0> = <class 'failure_demo.Bar'>()
+    E        +  where 1 = <failure_demo.Foo object at 0x26c35d0>.b
+    E        +    where <failure_demo.Foo object at 0x26c35d0> = <class 'failure_demo.Foo'>()
+    E        +  and   2 = <failure_demo.Bar object at 0x26c3c50>.b
+    E        +    where <failure_demo.Bar object at 0x26c3c50> = <class 'failure_demo.Bar'>()
     
     failure_demo.py:124: AssertionError
     __________________________ TestRaises.test_raises __________________________
     
-    self = <failure_demo.TestRaises instance at 0x16dfc68>
+    self = <failure_demo.TestRaises instance at 0x2738c68>
     
         def test_raises(self):
             s = 'qwe'
     <0-codegen /home/hpk/p/pytest/.tox/regen/local/lib/python2.7/site-packages/_pytest/python.py:838>:1: ValueError
     ______________________ TestRaises.test_raises_doesnt _______________________
     
-    self = <failure_demo.TestRaises instance at 0x16e83b0>
+    self = <failure_demo.TestRaises instance at 0x27413b0>
     
         def test_raises_doesnt(self):
     >       raises(IOError, "int('3')")
     failure_demo.py:136: Failed
     __________________________ TestRaises.test_raise ___________________________
     
-    self = <failure_demo.TestRaises instance at 0x16e14d0>
+    self = <failure_demo.TestRaises instance at 0x273a4d0>
     
         def test_raise(self):
     >       raise ValueError("demo error")
     failure_demo.py:139: ValueError
     ________________________ TestRaises.test_tupleerror ________________________
     
-    self = <failure_demo.TestRaises instance at 0x16d4248>
+    self = <failure_demo.TestRaises instance at 0x272d248>
     
         def test_tupleerror(self):
     >       a,b = [1]
     failure_demo.py:142: ValueError
     ______ TestRaises.test_reinterpret_fails_with_print_for_the_fun_of_it ______
     
-    self = <failure_demo.TestRaises instance at 0x16d4f80>
+    self = <failure_demo.TestRaises instance at 0x272df80>
     
         def test_reinterpret_fails_with_print_for_the_fun_of_it(self):
             l = [1,2,3]
     l is [1, 2, 3]
     ________________________ TestRaises.test_some_error ________________________
     
-    self = <failure_demo.TestRaises instance at 0x16d5d88>
+    self = <failure_demo.TestRaises instance at 0x272ed88>
     
         def test_some_error(self):
     >       if namenotexi:
-    E   NameError: global name 'namenotexi' is not defined
+    E       NameError: global name 'namenotexi' is not defined
     
     failure_demo.py:150: NameError
     ____________________ test_dynamic_compile_shows_nicely _____________________
     <2-codegen 'abc-123' /home/hpk/p/pytest/doc/en/example/assertion/failure_demo.py:162>:2: AssertionError
     ____________________ TestMoreErrors.test_complex_error _____________________
     
-    self = <failure_demo.TestMoreErrors instance at 0x16e8758>
+    self = <failure_demo.TestMoreErrors instance at 0x2741758>
     
         def test_complex_error(self):
             def f():
     failure_demo.py:5: AssertionError
     ___________________ TestMoreErrors.test_z1_unpack_error ____________________
     
-    self = <failure_demo.TestMoreErrors instance at 0x16cfd88>
+    self = <failure_demo.TestMoreErrors instance at 0x2728d88>
     
         def test_z1_unpack_error(self):
             l = []
     failure_demo.py:179: ValueError
     ____________________ TestMoreErrors.test_z2_type_error _____________________
     
-    self = <failure_demo.TestMoreErrors instance at 0x16d1b90>
+    self = <failure_demo.TestMoreErrors instance at 0x272ab90>
     
         def test_z2_type_error(self):
             l = 3
     failure_demo.py:183: TypeError
     ______________________ TestMoreErrors.test_startswith ______________________
     
-    self = <failure_demo.TestMoreErrors instance at 0x16d2998>
+    self = <failure_demo.TestMoreErrors instance at 0x272b998>
     
         def test_startswith(self):
             s = "123"
             g = "456"
     >       assert s.startswith(g)
-    E       assert <built-in method startswith of str object at 0x16dbaf8>('456')
-    E        +  where <built-in method startswith of str object at 0x16dbaf8> = '123'.startswith
+    E       assert <built-in method startswith of str object at 0x2734ad0>('456')
+    E        +  where <built-in method startswith of str object at 0x2734ad0> = '123'.startswith
     
     failure_demo.py:188: AssertionError
     __________________ TestMoreErrors.test_startswith_nested ___________________
     
-    self = <failure_demo.TestMoreErrors instance at 0x16d10e0>
+    self = <failure_demo.TestMoreErrors instance at 0x272a0e0>
     
         def test_startswith_nested(self):
             def f():
             def g():
                 return "456"
     >       assert f().startswith(g())
-    E       assert <built-in method startswith of str object at 0x16dbaf8>('456')
-    E        +  where <built-in method startswith of str object at 0x16dbaf8> = '123'.startswith
-    E        +    where '123' = <function f at 0x16fa938>()
-    E        +  and   '456' = <function g at 0x16ef848>()
+    E       assert <built-in method startswith of str object at 0x2734ad0>('456')
+    E        +  where <built-in method startswith of str object at 0x2734ad0> = '123'.startswith
+    E        +    where '123' = <function f at 0x27549b0>()
+    E        +  and   '456' = <function g at 0x27488c0>()
     
     failure_demo.py:195: AssertionError
     _____________________ TestMoreErrors.test_global_func ______________________
     
-    self = <failure_demo.TestMoreErrors instance at 0x16e27a0>
+    self = <failure_demo.TestMoreErrors instance at 0x273b7a0>
     
         def test_global_func(self):
     >       assert isinstance(globf(42), float)
     failure_demo.py:198: AssertionError
     _______________________ TestMoreErrors.test_instance _______________________
     
-    self = <failure_demo.TestMoreErrors instance at 0x16d4d88>
+    self = <failure_demo.TestMoreErrors instance at 0x272dd88>
     
         def test_instance(self):
             self.x = 6*7
     >       assert self.x != 42
     E       assert 42 != 42
-    E        +  where 42 = <failure_demo.TestMoreErrors instance at 0x16d4d88>.x
+    E        +  where 42 = <failure_demo.TestMoreErrors instance at 0x272dd88>.x
     
     failure_demo.py:202: AssertionError
     _______________________ TestMoreErrors.test_compare ________________________
     
-    self = <failure_demo.TestMoreErrors instance at 0x16d0560>
+    self = <failure_demo.TestMoreErrors instance at 0x2729560>
     
         def test_compare(self):
     >       assert globf(10) < 5
     failure_demo.py:205: AssertionError
     _____________________ TestMoreErrors.test_try_finally ______________________
     
-    self = <failure_demo.TestMoreErrors instance at 0x16cb3b0>
+    self = <failure_demo.TestMoreErrors instance at 0x271f3b0>
     
         def test_try_finally(self):
             x = 1
     E           assert 1 == 0
     
     failure_demo.py:210: AssertionError
-    ======================== 39 failed in 0.17 seconds =========================
+    ======================== 39 failed in 0.18 seconds =========================

doc/en/example/simple.txt

     
     test_module.py .s
     ========================= short test summary info ==========================
-    SKIP [1] /tmp/doc-exec-179/conftest.py:9: need --runslow option to run
+    SKIP [1] /tmp/doc-exec-293/conftest.py:9: need --runslow option to run
     
     =================== 1 passed, 1 skipped in 0.01 seconds ====================
 
     ========================= slowest 3 test durations =========================
     0.20s call     test_some_are_slow.py::test_funcslow2
     0.10s call     test_some_are_slow.py::test_funcslow1
-    0.00s call     test_some_are_slow.py::test_funcfast
+    0.00s setup    test_some_are_slow.py::test_funcfast
     ========================= 3 passed in 0.31 seconds =========================
 
 incremental testing - test steps
     ================================= FAILURES =================================
     ____________________ TestUserHandling.test_modification ____________________
     
-    self = <test_step.TestUserHandling instance at 0x2318638>
+    self = <test_step.TestUserHandling instance at 0x1db2638>
     
         def test_modification(self):
     >       assert 0

doc/en/fixture.txt

     ================================= FAILURES =================================
     ________________________________ test_ehlo _________________________________
     
-    smtp = <smtplib.SMTP instance at 0x14d2e18>
+    smtp = <smtplib.SMTP instance at 0x1eade18>
     
         def test_ehlo(smtp):
             response, msg = smtp.ehlo()
     E       assert 0
     
     test_smtpsimple.py:12: AssertionError
-    ========================= 1 failed in 0.54 seconds =========================
+    ========================= 1 failed in 0.20 seconds =========================
 
 In the failure traceback we see that the test function was called with a
 ``smtp`` argument, the ``smtplib.SMTP()`` instance created by the fixture
     ================================= FAILURES =================================
     ________________________________ test_ehlo _________________________________
     
-    smtp = <smtplib.SMTP instance at 0x27f63b0>
+    smtp = <smtplib.SMTP instance at 0x29213b0>
     
         def test_ehlo(smtp):
             response = smtp.ehlo()
     test_module.py:6: AssertionError
     ________________________________ test_noop _________________________________
     
-    smtp = <smtplib.SMTP instance at 0x27f63b0>
+    smtp = <smtplib.SMTP instance at 0x29213b0>
     
         def test_noop(smtp):
             response = smtp.noop()
     E       assert 0
     
     test_module.py:11: AssertionError
-    ========================= 2 failed in 0.21 seconds =========================
+    ========================= 2 failed in 0.20 seconds =========================
 
 You see the two ``assert 0`` failing and more importantly you can also see 
 that the same (session-scoped) ``smtp`` object was passed into the two 
 
     $ py.test -s -q --tb=no
     FF
-    finalizing <smtplib.SMTP instance at 0x1497758>
+    finalizing <smtplib.SMTP instance at 0x1a9d5a8>
 
 We see that the ``smtp`` instance is finalized after the two
 tests using it tests executed.  If we had specified ``scope='function'`` 
     ================================= FAILURES =================================
     __________________________ test_ehlo[merlinux.eu] __________________________
     
-    smtp = <smtplib.SMTP instance at 0x1742680>
+    smtp = <smtplib.SMTP instance at 0x1eae680>
     
         def test_ehlo(smtp):
             response = smtp.ehlo()
     test_module.py:6: AssertionError
     __________________________ test_noop[merlinux.eu] __________________________
     
-    smtp = <smtplib.SMTP instance at 0x1742680>
+    smtp = <smtplib.SMTP instance at 0x1eae680>
     
         def test_noop(smtp):
             response = smtp.noop()
     test_module.py:11: AssertionError
     ________________________ test_ehlo[mail.python.org] ________________________
     
-    smtp = <smtplib.SMTP instance at 0x174bfc8>
+    smtp = <smtplib.SMTP instance at 0x1eb7fc8>
     
         def test_ehlo(smtp):
             response = smtp.ehlo()
     test_module.py:5: AssertionError
     ________________________ test_noop[mail.python.org] ________________________
     
-    smtp = <smtplib.SMTP instance at 0x174bfc8>
+    smtp = <smtplib.SMTP instance at 0x1eb7fc8>
     
         def test_noop(smtp):
             response = smtp.noop()
     test_appsetup.py:12: test_smtp_exists[merlinux.eu] PASSED
     test_appsetup.py:12: test_smtp_exists[mail.python.org] PASSED
     
-    ========================= 2 passed in 0.25 seconds =========================
+    ========================= 2 passed in 0.17 seconds =========================
 
 Due to the parametrization of ``smtp`` the test will run twice with two
 different ``App`` instances and respective smtp servers.  There is no
 need for the ``app`` fixture to be aware of the ``smtp`` parametrization 
 as pytest will fully analyse the fixture dependency graph.  Note also,
-that the ``app`` fixture has a scope of ``module`` but uses a
-session-scoped ``smtp``: it is fine for fixtures to use "broader" scoped
-fixtures but not the other way round:  A session-scoped fixture could
-not use a module-scoped one in a meaningful way.
+that the ``app`` fixture has a scope of ``module`` but may use a
+session-scoped ``smtp`` from the example higher up: it is fine for
+fixtures to use "broader" scoped fixtures but not the other way round:
+A session-scoped fixture could not use a module-scoped one in a
+meaningful way.
 
 
 .. _`automatic per-resource grouping`:

doc/en/funcarg_compare.txt

 
 .. _`funcargcompare`:
 
-pytest-2.3: reasoning for the new funcarg and setup functions
+pytest-2.3: reasoning for fixture/funcarg evolution
 =============================================================
 
 **Target audience**: Reading this document requires basic knowledge of 

doc/en/getting-started.txt

     ================================= FAILURES =================================
     ____________________________ TestClass.test_two ____________________________
     
-    self = <test_class.TestClass instance at 0x1ab56c8>
+    self = <test_class.TestClass instance at 0x1f8a6c8>
     
         def test_two(self):
             x = "hello"
     ================================= FAILURES =================================
     _____________________________ test_needsfiles ______________________________
     
-    tmpdir = local('/tmp/pytest-1351/test_needsfiles0')
+    tmpdir = local('/tmp/pytest-1409/test_needsfiles0')
     
         def test_needsfiles(tmpdir):
             print tmpdir
     
     test_tmpdir.py:3: AssertionError
     ----------------------------- Captured stdout ------------------------------
-    /tmp/pytest-1351/test_needsfiles0
+    /tmp/pytest-1409/test_needsfiles0
 
 Before the test runs, a unique-per-test-invocation temporary directory
 was created.  More info at :ref:`tmpdir handling`.
 
 * :ref:`cmdline` for command line invocation examples
 * :ref:`good practises <goodpractises>` for virtualenv, test layout, genscript support
+* :ref:`fixtures` for providing a functional baseline to your tests
 * :ref:`apiref` for documentation and examples on using py.test
 * :ref:`plugins` managing and writing plugins
 

doc/en/parametrize.txt

     
         def test_valid_string(stringinput):
     >       assert stringinput.isalpha()
-    E       assert <built-in method isalpha of str object at 0x2b3ae7eb8030>()
-    E        +  where <built-in method isalpha of str object at 0x2b3ae7eb8030> = '!'.isalpha
+    E       assert <built-in method isalpha of str object at 0x2b7d7a85a030>()
+    E        +  where <built-in method isalpha of str object at 0x2b7d7a85a030> = '!'.isalpha
     
     test_strings.py:3: AssertionError
 
     $ py.test -q -rs test_strings.py 
     s
     ========================= short test summary info ==========================
-    SKIP [1] /home/hpk/p/pytest/.tox/regen/local/lib/python2.7/site-packages/_pytest/python.py:947: got empty parameter set, function test_valid_string at /tmp/doc-exec-145/test_strings.py:1
+    SKIP [1] /home/hpk/p/pytest/.tox/regen/local/lib/python2.7/site-packages/_pytest/python.py:947: got empty parameter set, function test_valid_string at /tmp/doc-exec-259/test_strings.py:1
 
 For further examples, you might want to look at :ref:`more
 parametrization examples <paramexamples>`.

doc/en/tmpdir.txt

     ================================= FAILURES =================================
     _____________________________ test_create_file _____________________________
     
-    tmpdir = local('/tmp/pytest-1352/test_create_file0')
+    tmpdir = local('/tmp/pytest-1410/test_create_file0')
     
         def test_create_file(tmpdir):
             p = tmpdir.mkdir("sub").join("hello.txt")

doc/en/unittest.txt

         def test_method1(self):
             assert hasattr(self, "db")
     >       assert 0, self.db   # fail for demo purposes
-    E       AssertionError: <conftest.DummyDB instance at 0x1276bd8>
+    E       AssertionError: <conftest.DummyDB instance at 0x2e36bd8>
     
     test_unittest_db.py:9: AssertionError
     ___________________________ MyTest.test_method2 ____________________________
     
         def test_method2(self):
     >       assert 0, self.db   # fail for demo purposes
-    E       AssertionError: <conftest.DummyDB instance at 0x1276bd8>
+    E       AssertionError: <conftest.DummyDB instance at 0x2e36bd8>
     
     test_unittest_db.py:12: AssertionError
     ========================= 2 failed in 0.02 seconds =========================
 changedir=doc/en
 deps=:pypi:sphinx
      :pypi:PyYAML
-     pytest
 
 commands=
     make clean
 changedir=doc/en
 deps=:pypi:sphinx
      :pypi:PyYAML
-     pytest
 commands=
     rm -rf /tmp/doc-exec*
     make regen
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.