11import json
22import random
33
4- import boto3
5-
64import localstack .sdk .aws
7- from tests .utils import retry , short_uid
5+ from tests .utils import boto_client , retry , short_uid
86
97SAMPLE_SIMPLE_EMAIL = {
108 "Subject" : {
@@ -25,13 +23,7 @@ class TestLocalStackAWS:
2523 client = localstack .sdk .aws .AWSClient ()
2624
2725 def test_list_sqs_messages (self ):
28- sqs_client = boto3 .client (
29- "sqs" ,
30- endpoint_url = self .client .configuration .host ,
31- region_name = "us-east-1" ,
32- aws_access_key_id = "test" ,
33- aws_secret_access_key = "test" ,
34- )
26+ sqs_client = boto_client ("sqs" )
3527 queue_name = f"queue-{ short_uid ()} "
3628 sqs_client .create_queue (QueueName = queue_name )
3729 queue_url = sqs_client .get_queue_url (QueueName = queue_name )["QueueUrl" ]
@@ -49,18 +41,12 @@ def test_list_sqs_messages(self):
4941 assert len (messages ) == 5
5042
5143 def test_list_sqs_messages_from_account_region (self ):
52- sqs_client_us = boto3 .client (
53- "sqs" ,
54- endpoint_url = self .client .configuration .host ,
55- region_name = "us-east-1" ,
56- aws_access_key_id = "test" ,
57- aws_secret_access_key = "test" ,
58- )
44+ sqs_client = boto_client ("sqs" )
5945 queue_name = f"queue-{ short_uid ()} "
60- sqs_client_us .create_queue (QueueName = queue_name )
61- queue_url = sqs_client_us .get_queue_url (QueueName = queue_name )["QueueUrl" ]
46+ sqs_client .create_queue (QueueName = queue_name )
47+ queue_url = sqs_client .get_queue_url (QueueName = queue_name )["QueueUrl" ]
6248
63- send_result = sqs_client_us .send_message (
49+ send_result = sqs_client .send_message (
6450 QueueUrl = queue_url ,
6551 MessageBody = json .dumps ({"event" : "random-event" , "message" : "random-message" }),
6652 )
@@ -72,13 +58,7 @@ def test_list_sqs_messages_from_account_region(self):
7258 assert messages [0 ].message_id == send_result ["MessageId" ]
7359
7460 def test_empty_queue (self ):
75- sqs_client = boto3 .client (
76- "sqs" ,
77- endpoint_url = self .client .configuration .host ,
78- region_name = "us-east-1" ,
79- aws_access_key_id = "test" ,
80- aws_secret_access_key = "test" ,
81- )
61+ sqs_client = boto_client ("sqs" )
8262 queue_name = f"queue-{ short_uid ()} "
8363 sqs_client .create_queue (QueueName = queue_name )
8464 messages = self .client .list_sqs_messages (
@@ -87,14 +67,7 @@ def test_empty_queue(self):
8767 assert messages == []
8868
8969 def test_get_and_discard_ses_messages (self ):
90- aws_client = boto3 .client (
91- "ses" ,
92- endpoint_url = self .client .configuration .host ,
93- region_name = "us-east-1" ,
94- aws_access_key_id = "test" ,
95- aws_secret_access_key = "test" ,
96- )
97-
70+ aws_client = boto_client ("ses" )
9871 email = f"user-{ short_uid ()} @example.com"
9972 aws_client .verify_email_address (EmailAddress = email )
10073
@@ -143,14 +116,7 @@ def test_get_and_discard_ses_messages(self):
143116 assert not self .client .get_ses_messages ()
144117
145118 def test_sns_platform_endpoint_messages (self ):
146- client = boto3 .client (
147- "sns" ,
148- endpoint_url = self .client .configuration .host ,
149- region_name = "us-east-1" ,
150- aws_access_key_id = "test" ,
151- aws_secret_access_key = "test" ,
152- )
153-
119+ client = boto_client ("sns" )
154120 # create a topic
155121 topic_name = f"topic-{ short_uid ()} "
156122 topic_arn = client .create_topic (Name = topic_name )["TopicArn" ]
@@ -219,14 +185,7 @@ def test_sns_platform_endpoint_messages(self):
219185 ], "platform messages not cleared"
220186
221187 def test_sns_messages (self ):
222- client = boto3 .client (
223- "sns" ,
224- endpoint_url = self .client .configuration .host ,
225- region_name = "us-east-1" ,
226- aws_access_key_id = "test" ,
227- aws_secret_access_key = "test" ,
228- )
229-
188+ client = boto_client ("sns" )
230189 numbers = [
231190 f"+{ random .randint (100000000 , 9999999999 )} " ,
232191 f"+{ random .randint (100000000 , 9999999999 )} " ,
0 commit comments