Skip to content

Commit ad3da64

Browse files
Update acktest and rename TestBootstrapResources (#5)
Description of changes: - Updated `acktest` to remove typo in `deserialize` - Renamed `TestBootstrapResources` to `BootstrapResources` so `pytest` will stop complaining that it's not a test class By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 191a020 commit ad3da64

File tree

4 files changed

+7
-9
lines changed

4 files changed

+7
-9
lines changed

test/e2e/bootstrap_resources.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222
from e2e import bootstrap_directory
2323

2424
@dataclass
25-
class TestBootstrapResources(Resources):
25+
class BootstrapResources(Resources):
2626
ClusterVPC: VPC
2727
ClusterRole: Role
2828
FargatePodRole: Role
2929

3030
_bootstrap_resources = None
3131

32-
def get_bootstrap_resources(bootstrap_file_name: str = "bootstrap.pkl") -> TestBootstrapResources:
32+
def get_bootstrap_resources(bootstrap_file_name: str = "bootstrap.pkl") -> BootstrapResources:
3333
global _bootstrap_resources
3434
if _bootstrap_resources is None:
35-
_bootstrap_resources = TestBootstrapResources.deseralize(bootstrap_directory, bootstrap_file_name=bootstrap_file_name)
35+
_bootstrap_resources = BootstrapResources.deserialize(bootstrap_directory, bootstrap_file_name=bootstrap_file_name)
3636
return _bootstrap_resources

test/e2e/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
acktest @ git+https://github.com/aws-controllers-k8s/test-infra.git@955d7831ee374a212250179e95a5f3b75e555fd9
1+
acktest @ git+https://github.com/aws-controllers-k8s/test-infra.git@8b21fd1a3374f506d35efe7426d5deed8b1bb1bf

test/e2e/service_bootstrap.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,12 @@
1818
from acktest.bootstrapping.iam import Role
1919
from acktest.bootstrapping.vpc import VPC
2020
from e2e import bootstrap_directory
21-
from e2e.bootstrap_resources import (
22-
TestBootstrapResources,
23-
)
21+
from e2e.bootstrap_resources import BootstrapResources
2422

2523
def service_bootstrap() -> Resources:
2624
logging.getLogger().setLevel(logging.INFO)
2725

28-
resources = TestBootstrapResources(
26+
resources = BootstrapResources(
2927
ClusterRole=Role("cluster-role", "eks.amazonaws.com", ["arn:aws:iam::aws:policy/AmazonEKSClusterPolicy"]),
3028
FargatePodRole=Role("fargate-pod-role", "eks-fargate-pods.amazonaws.com", ["arn:aws:iam::aws:policy/AmazonEKSFargatePodExecutionRolePolicy"]),
3129
ClusterVPC=VPC(name_prefix="cluster-vpc", num_public_subnet=2, num_private_subnet=2)

test/e2e/service_cleanup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
def service_cleanup():
2424
logging.getLogger().setLevel(logging.INFO)
2525

26-
resources = Resources.deseralize(bootstrap_directory)
26+
resources = Resources.deserialize(bootstrap_directory)
2727
resources.cleanup()
2828

2929
if __name__ == "__main__":

0 commit comments

Comments
 (0)