Convert fixtures/exceptions to Pytest

tests/test_s3/test_s3_utils.py

@@ -1,5 +1,6 @@
 from __future__ import unicode_literals
 import os
+import pytest
 from sure import expect
 from moto.s3.utils import (
     bucket_name_from_url,
@@ -8,7 +9,6 @@ from moto.s3.utils import (
     clean_key_name,
     undo_clean_key_name,
 )
-from parameterized import parameterized
 
 
 def test_base_url():
@@ -93,7 +93,7 @@ def test_parse_region_from_url():
         parse_region_from_url(url).should.equal(expected)
 
 
-@parameterized(
+@pytest.mark.parametrize("key,expected",
     [
         ("foo/bar/baz", "foo/bar/baz"),
         ("foo", "foo"),
@@ -107,7 +107,7 @@ def test_clean_key_name(key, expected):
     clean_key_name(key).should.equal(expected)
 
 
-@parameterized(
+@pytest.mark.parametrize("key,expected",
     [
         ("foo/bar/baz", "foo/bar/baz"),
         ("foo", "foo"),