parametrize some tests (#3786)

tests/test_helpers.py

@@ -895,9 +895,9 @@ class TestStreaming:
 
 
 class TestSafeJoin:
-    def test_safe_join(self):
+    @pytest.mark.parametrize(
-        # Valid combinations of *args and expected joined paths.
+        "args, expected",
-        passing = (
+        (
             (("a/b/c",), "a/b/c"),
             (("/", "a/", "b/", "c/"), "/a/b/c"),
             (("a", "b", "c"), "a/b/c"),
@@ -912,14 +912,14 @@ class TestSafeJoin:
             # Base directory is always considered safe
             (("../", "a/b/c"), "../a/b/c"),
             (("/..",), "/.."),
-        )
+        ),
+    )
+    def test_safe_join(self, args, expected):
+        assert flask.safe_join(*args) == expected
 
-        for args, expected in passing:
+    @pytest.mark.parametrize(
-            assert flask.safe_join(*args) == expected
+        "args",
-
+        (
-    def test_safe_join_exceptions(self):
-        # Should raise werkzeug.exceptions.NotFound on unsafe joins.
-        failing = (
             # path.isabs and ``..'' checks
             ("/a", "b", "/c"),
             ("/a", "../b/c"),
@@ -928,11 +928,11 @@ class TestSafeJoin:
             ("/a", "b/../b/../../c"),
             ("/a", "b", "c/../.."),
             ("/a", "b/../../c"),
-        )
+        ),
-
+    )
-        for args in failing:
+    def test_safe_join_exceptions(self, args):
-            with pytest.raises(NotFound):
+        with pytest.raises(NotFound):
-                print(flask.safe_join(*args))
+            print(flask.safe_join(*args))
 
 
 class TestHelpers: