Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SQS: Future-proof the changes in URLs (#5442)

Browse Source
This commit is contained in:
Bert Blommers 2022-09-01 19:20:11 +00:00 committed by GitHub
parent a2a1967ef8
commit 930c58bd13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tests/test_sqs/test_sqs.py
View File

@ -1,4 +1,5 @@
import json import json
import os
import time import time
import uuid import uuid
import hashlib import hashlib
@ -630,6 +631,19 @@ def test_set_queue_attributes():
queue.attributes["VisibilityTimeout"].should.equal("45") queue.attributes["VisibilityTimeout"].should.equal("45")
def _get_common_url(region):
# Different versions of botocore return different URLs
# See https://github.com/boto/botocore/issues/2705
common_name_enabled = (
os.environ.get("BOTO_DISABLE_COMMONNAME", "false").lower() == "false"
)
return (
f"https://{region}.queue.amazonaws.com"
if common_name_enabled
else f"https://sqs.{region}.amazonaws.com"
)
@mock_sqs @mock_sqs
def test_create_queues_in_multiple_region(): def test_create_queues_in_multiple_region():
w1 = boto3.client("sqs", region_name="us-west-1") w1 = boto3.client("sqs", region_name="us-west-1")
@ -640,19 +654,13 @@ def test_create_queues_in_multiple_region():
w2_name = str(uuid4())[0:6] w2_name = str(uuid4())[0:6]
w2.create_queue(QueueName=w2_name) w2.create_queue(QueueName=w2_name)
base_url = ( boto_common_url = _get_common_url("us-west-1")
"http://localhost:5000" base_url = "http://localhost:5000" if settings.TEST_SERVER_MODE else boto_common_url
if settings.TEST_SERVER_MODE
else "https://us-west-1.queue.amazonaws.com"
)
w1.list_queues()["QueueUrls"].should.contain(f"{base_url}/{ACCOUNT_ID}/{w1_name}") w1.list_queues()["QueueUrls"].should.contain(f"{base_url}/{ACCOUNT_ID}/{w1_name}")
w1.list_queues()["QueueUrls"].shouldnt.contain(f"{base_url}/{ACCOUNT_ID}/{w2_name}") w1.list_queues()["QueueUrls"].shouldnt.contain(f"{base_url}/{ACCOUNT_ID}/{w2_name}")
base_url = ( boto_common_url = _get_common_url("us-west-2")
"http://localhost:5000" base_url = "http://localhost:5000" if settings.TEST_SERVER_MODE else boto_common_url
if settings.TEST_SERVER_MODE
else "https://us-west-2.queue.amazonaws.com"
)
w2.list_queues()["QueueUrls"].shouldnt.contain(f"{base_url}/{ACCOUNT_ID}/{w1_name}") w2.list_queues()["QueueUrls"].shouldnt.contain(f"{base_url}/{ACCOUNT_ID}/{w1_name}")
w2.list_queues()["QueueUrls"].should.contain(f"{base_url}/{ACCOUNT_ID}/{w2_name}") w2.list_queues()["QueueUrls"].should.contain(f"{base_url}/{ACCOUNT_ID}/{w2_name}")
@ -667,11 +675,8 @@ def test_get_queue_with_prefix():
q_name2 = f"{prefix}-test" q_name2 = f"{prefix}-test"
conn.create_queue(QueueName=q_name2) conn.create_queue(QueueName=q_name2)
base_url = ( boto_common_url = _get_common_url("us-west-1")
"http://localhost:5000" base_url = "http://localhost:5000" if settings.TEST_SERVER_MODE else boto_common_url
if settings.TEST_SERVER_MODE
else "https://us-west-1.queue.amazonaws.com"
)
expected_url1 = f"{base_url}/{ACCOUNT_ID}/{q_name1}" expected_url1 = f"{base_url}/{ACCOUNT_ID}/{q_name1}"
expected_url2 = f"{base_url}/{ACCOUNT_ID}/{q_name2}" expected_url2 = f"{base_url}/{ACCOUNT_ID}/{q_name2}"