# HG changeset patch # User Thomas De Schampheleire # Date 1455125427 -3600 # Node ID 491961dfd0c8d601eacea0b5642ede71f0de7adb # Parent 6b67bbc1652e63bb07153c74fd51dd9903008270 pytest migration: files: convert to TestControllerPytest and parametrize Migrate the 'files' tests to pytest and its parametrize decorator. The syntax of this decorator is slightly different: a first argument is a comma-separated string with the method argument names for which the values are provided as second argument. diff -r 6b67bbc1652e -r 491961dfd0c8 kallithea/tests/functional/test_files.py --- a/kallithea/tests/functional/test_files.py Wed Feb 10 18:30:13 2016 +0100 +++ b/kallithea/tests/functional/test_files.py Wed Feb 10 18:30:27 2016 +0100 @@ -24,7 +24,7 @@ Session().commit() -class TestFilesController(TestController): +class TestFilesController(TestControllerPytest): def test_index(self): self.log_user() @@ -347,7 +347,7 @@ self.checkSessionFlash(response, 'No filename') - @parameterized.expand([ + @parametrize('location,filename', [ ('/abs', 'foo'), ('../rel', 'foo'), ('file/../foo', 'foo'), @@ -367,7 +367,7 @@ self.checkSessionFlash(response, 'Location must be relative path and must not contain .. in path') - @parameterized.expand([ + @parametrize('cnt,location,filename', [ (1, '', 'foo.txt'), (2, 'dir', 'foo.rst'), (3, 'rel/dir', 'foo.bar'), @@ -423,7 +423,7 @@ self.checkSessionFlash(response, 'No filename') - @parameterized.expand([ + @parametrize('location,filename', [ ('/abs', 'foo'), ('../rel', 'foo'), ('file/../foo', 'foo'), @@ -443,7 +443,7 @@ self.checkSessionFlash(response, 'Location must be relative path and must not contain .. in path') - @parameterized.expand([ + @parametrize('cnt,location,filename', [ (1, '', 'foo.txt'), (2, 'dir', 'foo.rst'), (3, 'rel/dir', 'foo.bar'),