Merge branch 'issue1629' of https://github.com/davehunt/pytest into features

2016-06-21 18:37:14 +02:00
parent f05d65dc42 393167b94f
commit 4350f499b2
57 changed files with 281 additions and 277 deletions
@@ -18,7 +18,7 @@ class TestParseIni:
        assert config.inicfg['name'] == 'value'

    def test_getcfg_empty_path(self, tmpdir):
-        getcfg([''], ['setup.cfg']) #happens on py.test ""
+        getcfg([''], ['setup.cfg']) #happens on pytest ""

    def test_append_parse_args(self, testdir, tmpdir, monkeypatch):
        monkeypatch.setenv('PYTEST_ADDOPTS', '--color no -rs --tb="short"')