get option settings from ini-file. make getting configuration options from conftest.py only an internal feature.

--HG-- branch : trunk
2010-10-31 17:41:58 +01:00
parent 1280041f0c
commit b6ec5a575d
12 changed files with 145 additions and 159 deletions
--- a/testing/plugin/test_helpconfig.py
+++ b/testing/plugin/test_helpconfig.py
@@ -15,8 +15,8 @@ def test_help(testdir):
    assert result.ret == 0
    result.stdout.fnmatch_lines([
        "*-v*verbose*",
-        "*settings*",
-        "*conftest.py*",
+        "*setup.cfg*",
+        "*minversion*",
    ])

 def test_collectattr():