p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[svn r63540] fixing shallow test bugs 

--HG--
branch : trunk
This commit is contained in:
hpk 2009-04-02 15:33:14 +02:00
parent a72ab92ed6
commit fbf70a35a2
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
py/test/plugin/pytest_resultdb.py
View File

@ -276,6 +276,9 @@ class BaseResultArchiveTests(object):
class TestJSONResultArchive(BaseResultArchiveTests): class TestJSONResultArchive(BaseResultArchiveTests):
cls = JSONResultArchive cls = JSONResultArchive
def setup_method(self, method):
py.test.importorskip("simplejson")
class TestSQLiteResultArchive(BaseResultArchiveTests): class TestSQLiteResultArchive(BaseResultArchiveTests):
cls = SQLiteResultArchive cls = SQLiteResultArchive

10
py/test/testing/test_config.py
View File

@ -55,13 +55,9 @@ class TestConfigCmdlineParsing:
type="int", dest="gdest", help="g value."), type="int", dest="gdest", help="g value."),
) )
""") """)
old = testdir.chdir() py.test.raises(ValueError, """
try: py.test.config._reparse(['-g', '17'])
py.test.raises(ValueError, """ """)
py.test.config._reparse(['-g', '17'])
""")
finally:
old.chdir()
def test_parsing_again_fails(self, tmpdir): def test_parsing_again_fails(self, tmpdir):
config = py.test.config._reparse([tmpdir]) config = py.test.config._reparse([tmpdir])