Skip to content

Commit 897248f

Browse files
authored
remove adopted resource CRD test (#188)
Description of changes: As the Adopted resource CRD and reconciler is being removed we are are also removing the tests associated with it By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent a962f53 commit 897248f

File tree

2 files changed

+1
-27
lines changed

2 files changed

+1
-27
lines changed

test/e2e/tests/test_bucket.py

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -132,32 +132,6 @@ def basic_bucket(s3_client) -> Generator[Bucket, None, None]:
132132
exists = bucket_exists(s3_client, bucket)
133133
assert not exists
134134

135-
class TestAdoptBucket(adoption.AbstractAdoptionTest):
136-
RESOURCE_PLURAL: str = RESOURCE_PLURAL
137-
RESOURCE_VERSION: str = CRD_VERSION
138-
139-
_bucket_name: str = random_suffix_name("ack-adopted-bucket", 63)
140-
141-
def bootstrap_resource(self):
142-
client = boto3.client('s3')
143-
region = get_region()
144-
if region == "us-east-1":
145-
client.create_bucket(Bucket=self._bucket_name)
146-
else:
147-
client.create_bucket(
148-
Bucket=self._bucket_name, CreateBucketConfiguration={"LocationConstraint": region}
149-
)
150-
151-
def cleanup_resource(self):
152-
client = boto3.client('s3')
153-
client.delete_bucket(Bucket=self._bucket_name)
154-
155-
def get_resource_spec(self) -> adoption.AdoptedResourceSpec:
156-
return adoption.AdoptedResourceSpec(
157-
aws=adoption.AdoptedResourceNameOrIDIdentifier(additionalKeys={}, nameOrID=self._bucket_name),
158-
kubernetes=adoption.AdoptedResourceKubernetesIdentifiers(CRD_GROUP, RESOURCE_KIND),
159-
)
160-
161135
@service_marker
162136
class TestBucket:
163137
def test_basic(self, basic_bucket):

test/e2e/tests/test_bucket_adoption_policy.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
from e2e.replacement_values import REPLACEMENT_VALUES
2828

2929
CREATE_WAIT_AFTER_SECONDS = 10
30-
MODIFY_WAIT_AFTER_SECONDS = 10
30+
MODIFY_WAIT_AFTER_SECONDS = 20
3131
DELETE_WAIT_AFTER_SECONDS = 10
3232
ACK_SYSTEM_TAG_PREFIX = "services.k8s.aws/"
3333
AWS_SYSTEM_TAG_PREFIX = "aws:"

0 commit comments

Comments
 (0)