Switch from nose to pytestpytest

1 files changed, 9 insertions, 20 deletions

diff --git a/tests/test_wsgilib.py b/tests/test_wsgilib.py
index 72573cf..e6514ef 100644
--- a/tests/test_wsgilib.py
+++ b/tests/test_wsgilib.py
@@ -1,3 +1,5 @@
+import pytest
+
 from paste.wsgilib import add_close
 
 
@@ -18,35 +20,22 @@ def close_func():
     close_func_called = True
 
 
-def test_add_close_bytes():
-    global close_func_called
-
-    close_func_called = False
-    lst = []
-    app_iterable = app_iterable_func_bytes()
-
-    obj = add_close(app_iterable, close_func)
-    for x in obj:
-        lst.append(x)
-    obj.close()
-
-    assert lst == [b'a', b'b', b'c']
-    assert close_func_called
-    assert obj._closed
-
-
-def test_add_close_unicode():
+@pytest.mark.parametrize("app_iterable_func,expected", [
+    (app_iterable_func_bytes, [b'a', b'b', b'c']),
+    (app_iterable_func_unicode, ['a', 'b', 'c']),
+])
+def test_add_close(app_iterable_func, expected):
     global close_func_called
 
     close_func_called = False
     lst = []
-    app_iterable = app_iterable_func_unicode()
+    app_iterable = app_iterable_func()
 
     obj = add_close(app_iterable, close_func)
     for x in obj:
         lst.append(x)
     obj.close()
 
-    assert lst == ['a', 'b', 'c']
+    assert lst == expected
     assert close_func_called
     assert obj._closed