From ea7d920eb0a0bdd2cba811fabf77c2b698b66970 Mon Sep 17 00:00:00 2001 From: Gang Li Date: Mon, 30 Sep 2024 10:35:08 +0800 Subject: [PATCH] Enable test_check_invalidation for CloudFront test As moto 5.0.16 added support fot get_invalidation Signed-off-by: Gang Li --- tests/requirements.txt | 2 +- tests/test_cf_reindex.py | 4 ++++ tests/test_cfclient.py | 5 ----- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index 43ac571..09f6326 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -5,5 +5,5 @@ pytest-cov pytest-html flake8 requests-mock -moto>=5.0.3,<6 +moto>=5.0.16,<6 python-gnupg>=0.5.0,<1 diff --git a/tests/test_cf_reindex.py b/tests/test_cf_reindex.py index 5b5a48f..944a86f 100644 --- a/tests/test_cf_reindex.py +++ b/tests/test_cf_reindex.py @@ -27,6 +27,10 @@ @mock_aws class CFReIndexTest(CFBasedTest): + ''' + This test is deprecated because the cf invalidation after re_index + is not used anymore. + ''' @pytest.mark.skip(reason="Indexing CF invalidation is abandoned") def test_cf_maven_after_reindex(self): response = self.mock_cf.list_invalidations(DistributionId=self.test_dist_id) diff --git a/tests/test_cfclient.py b/tests/test_cfclient.py index 8a38a68..3c9f4e0 100644 --- a/tests/test_cfclient.py +++ b/tests/test_cfclient.py @@ -18,7 +18,6 @@ from charon.cache import CFClient from moto import mock_aws import boto3 -import pytest @mock_aws @@ -62,10 +61,6 @@ def test_invalidate_paths_multi(self): self.assertTrue(r['Id']) self.assertEqual('completed', str.lower(r['Status'])) - @pytest.mark.skip(reason=""" - Because current moto 5.0.3 has not implemented the get_invalidation(), - this test will fail. Will enable it when the it is implemented in future moto - """) def test_check_invalidation(self): dist_id = self.cf_client.get_dist_id_by_domain("maven.repository.redhat.com") result = self.cf_client.invalidate_paths(dist_id, ["/*"])