skipif instead of xfail

bentsku · bentsku · commit bd844781b4d7 · 2023-09-13T19:07:49.000+02:00
diff --git a/tests/aws/services/resource_groups/test_resource_groups.py b/tests/aws/services/resource_groups/test_resource_groups.py
@@ -124,7 +124,9 @@ def test_create_group(self, aws_client, resourcegroups_create_group, snapshot):
         assert 0 == len(response["Groups"])
 
     @markers.aws.validated
-    @pytest.mark.xfail(reason="Not implemented in moto (ListGroupResources)")
+    @pytest.mark.skipif(
+        condition=not is_aws_cloud(), reason="Not implemented in moto (ListGroupResources)"
+    )
     def test_resource_groups_tag_query(
         self, aws_client, snapshot, resourcegroups_create_group, s3_bucket, sqs_create_queue
     ):
@@ -185,7 +187,9 @@ def _get_group_resources():
         snapshot.match("list-group-resources-after-queue-removal", response)
 
     @markers.aws.validated
-    @pytest.mark.xfail(reason="Not implemented in moto (ListGroupResources)")
+    @pytest.mark.skipif(
+        condition=not is_aws_cloud(), reason="Not implemented in moto (ListGroupResources)"
+    )
     def test_resource_groups_different_region(
         self, aws_client_factory, snapshot, resourcegroups_create_group, sqs_create_queue_in_region
     ):
@@ -225,7 +229,9 @@ def test_resource_groups_different_region(
         snapshot.match("list-group-resources", response)
 
     @markers.aws.validated
-    @pytest.mark.xfail(reason="Not implemented in moto (ListGroupResources)")
+    @pytest.mark.skipif(
+        condition=not is_aws_cloud(), reason="Not implemented in moto (ListGroupResources)"
+    )
     def test_resource_type_filters(
         self, aws_client, snapshot, resourcegroups_create_group, s3_bucket, sqs_create_queue
     ):
@@ -264,11 +270,18 @@ def test_resource_type_filters(
         snapshot.match("list-group-resources", response)
 
     @markers.aws.validated
-    @pytest.mark.xfail(reason="Not implemented in moto (ListGroupResources)")
+    @pytest.mark.skipif(
+        condition=not is_aws_cloud(), reason="Not implemented in moto (ListGroupResources)"
+    )
     def test_cloudformation_query(
         self, aws_client, deploy_cfn_template, snapshot, resourcegroups_create_group
     ):
-        snapshot.add_transformer(snapshot.transform.key_value("StackIdentifier"))
+        snapshot.add_transformers_list(
+            [
+                snapshot.transform.key_value("StackIdentifier"),
+                snapshot.transform.resource_name(),
+            ]
+        )
         stack = deploy_cfn_template(
             template_path=os.path.join(
                 os.path.dirname(__file__), "../../templates/deploy_template_2.yaml"
@@ -278,7 +291,6 @@ def test_cloudformation_query(
         assert len(stack.outputs) == 3
         topic_arn = stack.outputs["MyTopic"]
 
-        snapshot.add_transformer(snapshot.transform.resource_name())
         group_name = f"resource_group-{short_uid()}"
         response = resourcegroups_create_group(
             Name=group_name,
@@ -324,8 +336,11 @@ def test_cloudformation_query(
         snapshot.match("create-group-with-delete-stack", e.value.response)
 
     @markers.aws.validated
-    @pytest.mark.xfail(reason="Not implemented in moto (ListGroupResources)")
+    @pytest.mark.skipif(
+        condition=not is_aws_cloud(), reason="Not implemented in moto (SearchResources)"
+    )
     def test_search_resources(self, aws_client, sqs_create_queue, snapshot):
+        snapshot.add_transformer(snapshot.transform.resource_name())
         # create SQS queue with tags
         queue_url = sqs_create_queue(tags={"Stage": "test-resource-group"})
         queue_tags = aws_client.sqs.list_queue_tags(QueueUrl=queue_url)
diff --git a/tests/aws/services/resource_groups/test_resource_groups.snapshot.json b/tests/aws/services/resource_groups/test_resource_groups.snapshot.json
@@ -374,7 +374,7 @@
     }
   },
   "tests/aws/services/resource_groups/test_resource_groups.py::TestResourceGroups::test_search_resources": {
-    "recorded-date": "13-09-2023, 18:57:04",
+    "recorded-date": "13-09-2023, 19:06:38",
     "recorded-content": {
       "queue-tags": {
         "Tags": {
@@ -389,7 +389,7 @@
         "QueryErrors": [],
         "ResourceIdentifiers": [
           {
-            "ResourceArn": "arn:aws:sqs:<region>:111111111111:test-queue-15628f71",
+            "ResourceArn": "arn:aws:sqs:<region>:111111111111:<resource:1>",
             "ResourceType": "AWS::SQS::Queue"
           }
         ],

Original file line number	Diff line number	Diff line change
`@@ -374,7 +374,7 @@`
`374`	`374`	`}`
`375`	`375`	`},`
`376`	`376`	`"tests/aws/services/resource_groups/test_resource_groups.py::TestResourceGroups::test_search_resources": {`
`377`		`- "recorded-date": "13-09-2023, 18:57:04",`
	`377`	`+ "recorded-date": "13-09-2023, 19:06:38",`
`378`	`378`	`"recorded-content": {`
`379`	`379`	`"queue-tags": {`
`380`	`380`	`"Tags": {`
`@@ -389,7 +389,7 @@`
`389`	`389`	`"QueryErrors": [],`
`390`	`390`	`"ResourceIdentifiers": [`
`391`	`391`	`{`
`392`		`- "ResourceArn": "arn:aws:sqs:<region>:111111111111:test-queue-15628f71",`
	`392`	`+ "ResourceArn": "arn:aws:sqs:<region>:111111111111:<resource:1>",`
`393`	`393`	`"ResourceType": "AWS::SQS::Queue"`
`394`	`394`	`}`
`395`	`395`	`],`