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

Techdebt: Remove warnings from tests (#6478)

Browse Source
This commit is contained in:
Bert Blommers 2023-07-04 09:35:31 +00:00 committed by GitHub
parent bc67c9410d
commit 82c0166995
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/test_cloudformation/fixtures/single_instance_with_ebs_volume.py
View File

@ -99,7 +99,6 @@ template = {
"function error_exit\n", "function error_exit\n",
"{\n", "{\n",
' /opt/aws/bin/cfn-signal -e 1 -r "$1" \'', ' /opt/aws/bin/cfn-signal -e 1 -r "$1" \'',
{"Ref": "WaitHandle"},
"'\n", "'\n",
" exit 1\n", " exit 1\n",
"}\n", "}\n",
@ -122,7 +121,6 @@ template = {
"gollum --port 80 --host 0.0.0.0 &\n", "gollum --port 80 --host 0.0.0.0 &\n",
"# If all is well so signal success\n", "# If all is well so signal success\n",
'/opt/aws/bin/cfn-signal -e $? -r "Rails application setup complete" \'', '/opt/aws/bin/cfn-signal -e $? -r "Rails application setup complete" \'',
{"Ref": "WaitHandle"},
"'\n", "'\n",
], ],
] ]
@ -185,16 +183,6 @@ template = {
"VolumeId": {"Ref": "DataVolume"}, "VolumeId": {"Ref": "DataVolume"},
}, },
}, },
"WaitCondition": {
"DependsOn": "MountPoint",
"Type": "AWS::CloudFormation::WaitCondition",
"Properties": {"Handle": {"Ref": "WaitHandle"}, "Timeout": "300"},
"Metadata": {
"Comment1": "Note that the WaitCondition is dependent on the volume mount point allowing the volume to be created and attached to the EC2 instance",
"Comment2": "The instance bootstrap script waits for the volume to be attached to the instance prior to installing Gollum and signalling completion",
},
},
"WaitHandle": {"Type": "AWS::CloudFormation::WaitConditionHandle"},
}, },
"Mappings": { "Mappings": {
"AWSInstanceType2Arch": { "AWSInstanceType2Arch": {

8
tests/test_cloudformation/fixtures/vpc_single_instance_in_subnet.py
View File

@ -65,7 +65,6 @@ template = {
"Tags": [{"Value": {"Ref": "AWS::StackId"}, "Key": "Application"}], "Tags": [{"Value": {"Ref": "AWS::StackId"}, "Key": "Application"}],
}, },
}, },
"WebServerWaitHandle": {"Type": "AWS::CloudFormation::WaitConditionHandle"},
"Route": { "Route": {
"Type": "AWS::EC2::Route", "Type": "AWS::EC2::Route",
"Properties": { "Properties": {
@ -95,11 +94,6 @@ template = {
"Tags": [{"Value": {"Ref": "AWS::StackId"}, "Key": "Application"}], "Tags": [{"Value": {"Ref": "AWS::StackId"}, "Key": "Application"}],
}, },
}, },
"WebServerWaitCondition": {
"Type": "AWS::CloudFormation::WaitCondition",
"Properties": {"Handle": {"Ref": "WebServerWaitHandle"}, "Timeout": "300"},
"DependsOn": "WebServerInstance",
},
"VPC": { "VPC": {
"Type": "AWS::EC2::VPC", "Type": "AWS::EC2::VPC",
"Properties": { "Properties": {
@ -142,7 +136,6 @@ template = {
"function error_exit\n", "function error_exit\n",
"{\n", "{\n",
' /opt/aws/bin/cfn-signal -e 1 -r "$1" \'', ' /opt/aws/bin/cfn-signal -e 1 -r "$1" \'',
{"Ref": "WebServerWaitHandle"},
"'\n", "'\n",
" exit 1\n", " exit 1\n",
"}\n", "}\n",
@ -157,7 +150,6 @@ template = {
"/opt/aws/bin/cfn-hup || error_exit 'Failed to start cfn-hup'\n", "/opt/aws/bin/cfn-hup || error_exit 'Failed to start cfn-hup'\n",
"# All done so signal success\n", "# All done so signal success\n",
'/opt/aws/bin/cfn-signal -e 0 -r "WebServer setup complete" \'', '/opt/aws/bin/cfn-signal -e 0 -r "WebServer setup complete" \'',
{"Ref": "WebServerWaitHandle"},
"'\n", "'\n",
], ],
] ]

2
tests/test_dynamodb/models/test_item.py
View File

@ -3,7 +3,7 @@ from moto.dynamodb.models.dynamo_type import serializer
class TestFindNestedKeys: class TestFindNestedKeys:
def setup(self): def setup_method(self):
self.dct = { self.dct = {
"simplestring": "val", "simplestring": "val",
"nesteddict": { "nesteddict": {

2
tests/test_dynamodb/models/test_utilities.py
View File

@ -2,7 +2,7 @@ from moto.dynamodb.models.utilities import find_nested_key
class TestFindDictionaryKeys: class TestFindDictionaryKeys:
def setup(self): def setup_method(self):
self.item = { self.item = {
"simplestring": "val", "simplestring": "val",
"nesteddict": { "nesteddict": {

4
tests/test_ec2/test_instances.py
View File

@ -2563,7 +2563,7 @@ def test_instance_iam_instance_profile():
) )
result1 = ec2_resource.create_instances( result1 = ec2_resource.create_instances(
ImageId="ami-d3adb33f", ImageId=EXAMPLE_AMI_ID,
MinCount=1, MinCount=1,
MaxCount=1, MaxCount=1,
IamInstanceProfile={ IamInstanceProfile={
@ -2576,7 +2576,7 @@ def test_instance_iam_instance_profile():
assert profile["InstanceProfile"]["Arn"] == instance.iam_instance_profile["Arn"] assert profile["InstanceProfile"]["Arn"] == instance.iam_instance_profile["Arn"]
result2 = ec2_resource.create_instances( result2 = ec2_resource.create_instances(
ImageId="ami-d3adb33f", ImageId=EXAMPLE_AMI_ID,
MinCount=1, MinCount=1,
MaxCount=1, MaxCount=1,
IamInstanceProfile={ IamInstanceProfile={