address issue122 -- explode "params" into a list in fixture function decorators

2013-12-09 10:48:15 +01:00
parent 5c3d692008
commit 7766526992
3 changed files with 34 additions and 2 deletions
--- a/_pytest/python.py
+++ b/_pytest/python.py
@@ -76,8 +76,9 @@ def fixture(scope="function", params=None, autouse=False):
        # direct decoration
        return FixtureFunctionMarker(
                "function", params, autouse)(scope)
-    else:
-        return FixtureFunctionMarker(scope, params, autouse)
+    if params is not None and not isinstance(params, (list, tuple)):
+        params = list(params)
+    return FixtureFunctionMarker(scope, params, autouse)

 def yield_fixture(scope="function", params=None, autouse=False):
    """ (return a) decorator to mark a yield-fixture factory function