floraachy/pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some python2.5/3.3 fixes of Brianna's parametrize improvements

Browse Source
This commit is contained in:
holger krekel
2013-07-16 15:43:20 +02:00
parent ca8281f229
commit 60a53c75a6
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
testing/python/metafunc.py
View File

@@ -99,12 +99,12 @@ class TestMetafunc:
def func(x, y): pass
metafunc = self.Metafunc(func)
with pytest.raises(ValueError):
metafunc.parametrize("x", [1,2], ids=['basic'])
pytest.raises(ValueError, lambda:
metafunc.parametrize("x", [1,2], ids=['basic']))
with pytest.raises(ValueError):
pytest.raises(ValueError, lambda:
metafunc.parametrize(("x","y"), [("abc", "def"),
("ghi", "jkl")], ids=["one"])
("ghi", "jkl")], ids=["one"]))
def test_parametrize_with_userobjects(self):
def func(x, y): pass
@@ -140,7 +140,7 @@ class TestMetafunc:
(True, False),
(None, None),
(list("six"), [66, 66]),
({7}, set("seven")),
(set([7]), set("seven")),
(tuple("eight"), (8, -8, 8))
])
assert result == ["1.0--1.1",