catalin/moto
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Convert fixtures/exceptions to Pytest

Browse source
This commit is contained in:
Bert Blommers 2020-11-11 15:54:01 +00:00
commit cb6731f340
16 changed files with 119 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tests/test_s3/test_s3.py
View file

@ -24,7 +24,6 @@ from botocore.handlers import disable_signing
from boto.s3.connection import S3Connection
from boto.s3.key import Key
from freezegun import freeze_time
from parameterized import parameterized
import six
import requests
from moto.s3.responses import DEFAULT_REGION_NAME
@ -426,7 +425,7 @@ def test_copy_key():
bucket.get_key("new-key").get_contents_as_string().should.equal(b"some value")
@parameterized([("the-unicode-💩-key",), ("key-with?question-mark",)])
@pytest.mark.parametrize("key_name", ["the-unicode-💩-key", "key-with?question-mark"])
@mock_s3_deprecated
def test_copy_key_with_special_chars(key_name):
conn = boto.connect_s3("the_key", "the_secret")
@ -4016,7 +4015,7 @@ def test_root_dir_with_empty_name_works():
store_and_read_back_a_key("/")
@parameterized(["mybucket", "my.bucket"])
@pytest.mark.parametrize("bucket_name", ["mybucket", "my.bucket"])
@mock_s3
def test_leading_slashes_not_removed(bucket_name):
"""Make sure that leading slashes are not removed internally."""
@ -4038,8 +4037,8 @@ def test_leading_slashes_not_removed(bucket_name):
e.value.response["Error"]["Code"].should.equal("NoSuchKey")
@parameterized(
[("foo/bar/baz",), ("foo",), ("foo/run_dt%3D2019-01-01%252012%253A30%253A00",)]
@pytest.mark.parametrize("key",
["foo/bar/baz", "foo", "foo/run_dt%3D2019-01-01%252012%253A30%253A00"]
)
@mock_s3
def test_delete_objects_with_url_encoded_key(key):

6
tests/test_s3/test_s3_utils.py
View file

@ -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"),