Skip to content

Commit

Permalink
feat!: rework package to facilitate worker agent integ tests
Browse files Browse the repository at this point in the history
  • Loading branch information
jericht committed Aug 31, 2023
1 parent 4916038 commit 61ced4b
Show file tree
Hide file tree
Showing 34 changed files with 4,560 additions and 2,192 deletions.
37 changes: 23 additions & 14 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dynamic = ["version"]
requires-python = ">=3.7"

dependencies = [
"boto3 ~= 1.26",
"boto3 ~= 1.26",
]

[project.entry-points.pytest11]
Expand Down Expand Up @@ -58,11 +58,15 @@ files = [ "src/**/*.py" ]

[[tool.mypy.overrides]]
module = [
"boto3",
"botocore.*"
"boto3",
"botocore.*"
]
ignore_missing_imports = true

[[tool.mypy.overrides]]
module = "moto"
ignore_missing_imports = true

[tool.ruff]
ignore = [
"E501",
Expand All @@ -80,26 +84,31 @@ line-length = 100
[tool.pytest.ini_options]
xfail_strict = true
addopts = [
"--durations=5",
"--cov=src/deadline_test_scaffolding",
"--color=yes",
"--cov-report=html:build/coverage",
"--cov-report=xml:build/coverage/coverage.xml",
"--cov-report=term-missing",
"--numprocesses=auto",
"--durations=5",
"--cov=src/deadline_test_scaffolding",
"--color=yes",
"--cov-report=html:build/coverage",
"--cov-report=xml:build/coverage/coverage.xml",
"--cov-report=term-missing",
"--numprocesses=auto",
]
testpaths = [ "test" ]
looponfailroots = [
"src",
"test",
"src",
"test",
]
# looponfailroots is deprecated, this removes the deprecation from the test output
filterwarnings = [
"ignore::DeprecationWarning"
"ignore::DeprecationWarning"
]

[tool.coverage.run]
source_pkgs = [ "deadline_test_scaffolding" ]
omit = [
"models.py",
"fixtures.py",
"deadline/stubs.py",
]


[tool.coverage.paths]
Expand All @@ -108,4 +117,4 @@ source = [
]

[tool.coverage.report]
show_missing = true
show_missing = true
1 change: 1 addition & 0 deletions requirements-testing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ pytest-cov ~= 4.1
pytest-timeout ~= 2.1
pytest-xdist ~= 3.3
black ~= 23.7
moto[all] ~= 4.2
mypy == 1.5.0
ruff ~= 0.0.284
twine ~= 4.0
63 changes: 56 additions & 7 deletions src/deadline_test_scaffolding/__init__.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,66 @@
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
from .deadline_manager import DeadlineManager, DeadlineClient
from .deadline_stub import StubDeadlineClient
from .fixtures import deadline_manager_fixture, deadline_scaffolding, create_worker_agent
from .deadline import (
CommandResult,
DeadlineClient,
DeadlineWorker,
DeadlineWorkerConfiguration,
DockerContainerWorker,
EC2InstanceWorker,
Job,
Farm,
Fleet,
PipInstall,
Queue,
QueueFleetAssociation,
TaskStatus,
)
from .fixtures import (
BootstrapResources,
DeadlineResources,
bootstrap_resources,
deadline_client,
deadline_resources,
deploy_job_attachment_resources,
worker,
)
from .job_attachment_manager import JobAttachmentManager
from .models import (
CodeArtifactRepositoryInfo,
JobAttachmentSettings,
S3Object,
ServiceModel,
)
from ._version import __version__ as version # noqa

__all__ = [
"DeadlineManager",
"BootstrapResources",
"CodeArtifactRepositoryInfo",
"CommandResult",
"DeadlineResources",
"DeadlineClient",
"DeadlineScaffolding",
"DeadlineSubmitter",
"DeadlineJob",
"DeadlineWorker",
"DeadlineWorkerConfiguration",
"DockerContainerWorker",
"EC2InstanceWorker",
"Farm",
"Fleet",
"Job",
"JobAttachmentSettings",
"JobAttachmentManager",
"deadline_manager_fixture",
"deadline_scaffolding",
"PipInstall",
"S3Object",
"ServiceModel",
"StubDeadlineClient",
"Queue",
"QueueFleetAssociation",
"TaskStatus",
"bootstrap_resources",
"deadline_client",
"deadline_resources",
"deploy_job_attachment_resources",
"version",
"create_worker_agent",
"worker",
]
42 changes: 0 additions & 42 deletions src/deadline_test_scaffolding/cf_templates/job_attachments.yaml

This file was deleted.

7 changes: 7 additions & 0 deletions src/deadline_test_scaffolding/cloudformation/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
from .job_attachments_bootstrap_stack import JobAttachmentsBootstrapStack
from .worker_bootstrap_stack import WorkerBootstrapStack

__all__ = [
"JobAttachmentsBootstrapStack",
"WorkerBootstrapStack",
]
Loading

0 comments on commit 61ced4b

Please sign in to comment.