cleanup

steffyP · steffyP · commit f0b34d7b8a03 · 2024-07-29T09:58:42.000+02:00
diff --git a/localstack-core/localstack/services/cloudwatch/cloudwatch_database_helper.py b/localstack-core/localstack/services/cloudwatch/cloudwatch_database_helper.py
@@ -259,8 +259,7 @@ def get_metric_data_stat(
         sql_query = f"""
         SELECT
             {STAT_TO_SQLITE_AGGREGATION_FUNC[stat]},
-            SUM(count),
-            dimensions
+            SUM(count)
         FROM (
             SELECT
             value, 1 as count,
diff --git a/tests/aws/services/cloudwatch/test_cloudwatch.py b/tests/aws/services/cloudwatch/test_cloudwatch.py
@@ -2541,7 +2541,6 @@ def test_multiple_dimensions_statistics(self, aws_client, snapshot):
                 }
             ],
         )
-        time.sleep(2)
         aws_client.cloudwatch.put_metric_data(
             Namespace=namespace,
             MetricData=[
@@ -2584,9 +2583,16 @@ def assert_results():
         sleep_before = 2 if is_aws_cloud() else 0
         retry(assert_results, retries=retries, sleep_before=sleep_before)
 
-        list_metrics_res = aws_client.cloudwatch.list_metrics(
-            Namespace=namespace, MetricName=metric_name, Dimensions=dimensions
-        )
+        def list_metrics():
+            res = aws_client.cloudwatch.list_metrics(
+                Namespace=namespace, MetricName=metric_name, Dimensions=dimensions
+            )
+            assert len(res["Metrics"]) > 0
+            return res
+
+        retries = 10 if is_aws_cloud() else 1
+        sleep_before = 2 if is_aws_cloud() else 0
+        list_metrics_res = retry(list_metrics, retries=retries, sleep_before=sleep_before)
 
         # Function to sort the dimensions by "Name"
         def sort_dimensions(data: dict):
diff --git a/tests/aws/services/cloudwatch/test_cloudwatch.validation.json b/tests/aws/services/cloudwatch/test_cloudwatch.validation.json
@@ -45,7 +45,7 @@
     "last_validated_date": "2023-10-26T08:07:59+00:00"
   },
   "tests/aws/services/cloudwatch/test_cloudwatch.py::TestCloudwatch::test_multiple_dimensions_statistics": {
-    "last_validated_date": "2024-07-26T15:38:56+00:00"
+    "last_validated_date": "2024-07-29T07:56:05+00:00"
   },
   "tests/aws/services/cloudwatch/test_cloudwatch.py::TestCloudwatch::test_put_metric_alarm": {
     "last_validated_date": "2024-01-19T14:26:26+00:00"
