Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@ include src/toil/server/api_spec/workflow_execution_service.swagger.yaml
include src/toil/test/cwl/colon_test_output_job.yaml
include src/toil/test/cwl/conditional_wf.yaml
include src/toil/test/cwl/mock_mpi/fake_mpi.yml
include src/toil/test/cwl/mock_mpi/fake_mpi_run.py
include src/toil/test/docs/scripts/*
include src/toil/test/utils/ABCWorkflowDebug/sleep.yaml
include src/toil/test/utils/ABCWorkflowDebug/*
recursive-include src/toil/test/ *.cwl
recursive-include src/toil/test/ *.txt
recursive-include src/toil/test/ *.json
recursive-include src/toil/test/ *.ms
2 changes: 1 addition & 1 deletion src/toil/test/cwl/cwlTest.py
Original file line number Diff line number Diff line change
Expand Up @@ -2048,7 +2048,7 @@ def test_filename_conflict_resolution(tmp_path: Path) -> None:
str(msin),
]
p = subprocess.run(cmd, capture_output=True, text=True)
assert "Finished toil run successfully" in p.stderr
assert "Finished toil run successfully" in p.stderr, p
assert p.returncode == 0


Expand Down
2 changes: 1 addition & 1 deletion src/toil/test/cwl/mpi_simple.cwl
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ doc: |
processes. Requires Python (but you have cwltool running, right?)
and an MPI implementation.

baseCommand: python
baseCommand: python3
requirements:
cwltool:MPIRequirement:
processes: 2
Expand Down
2 changes: 1 addition & 1 deletion src/toil/test/jobStores/jobStoreTest.py
Original file line number Diff line number Diff line change
Expand Up @@ -1879,7 +1879,7 @@ def test_includes_decoration_without_local_suggestion(self):
assert "wdl" in result


# @needs_aws_s3
@needs_aws_s3
class InvalidAWSJobStoreTest(ToilTest):
def testInvalidJobStoreName(self):
from toil.jobStores.aws.jobStore import AWSJobStore
Expand Down
2 changes: 1 addition & 1 deletion src/toil/test/lib/aws/test_s3.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
from typing import TYPE_CHECKING, Optional

from toil.lib.aws.session import establish_boto3_session
from toil.lib.aws.s3 import create_s3_bucket, delete_s3_bucket
from toil.lib.aws.utils import get_bucket_region
from toil.test import ToilTest, needs_aws_s3

Expand All @@ -43,6 +42,7 @@ def setUpClass(cls) -> None:

def test_create_bucket(self) -> None:
"""Test bucket creation for us-east-1."""
from toil.lib.aws.s3 import create_s3_bucket, delete_s3_bucket
bucket_name = f"toil-s3test-{uuid.uuid4()}"
assert self.s3_resource
bucket: Optional["Bucket"] = None
Expand Down
3 changes: 2 additions & 1 deletion src/toil/test/provisioners/aws/awsProvisionerTest.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
get_aws_zone_from_spot_market,
get_best_aws_zone,
)
from toil.provisioners.aws.awsProvisioner import AWSProvisioner
from toil.test import (
get_data,
integrative,
Expand Down Expand Up @@ -95,6 +94,7 @@ def ec2_client(self, aws_region):

# Needs to talk to EC2 for image discovery
def test_AMI_finding(self):
from toil.provisioners.aws.awsProvisioner import AWSProvisioner
for zone in ["us-west-2a", "eu-central-1a", "sa-east-1b"]:
provisioner = AWSProvisioner(
"fakename", "mesos", zone, 10000, None, None, enable_fuse=False
Expand All @@ -109,6 +109,7 @@ def test_read_write_global_files(self, aws_zone):
Make sure the `_write_file_to_cloud()` and `_read_file_from_cloud()`
functions of the AWS provisioner work as intended.
"""
from toil.provisioners.aws.awsProvisioner import AWSProvisioner
provisioner = AWSProvisioner(
f"aws-provisioner-test-{uuid4()}",
"mesos",
Expand Down
2 changes: 0 additions & 2 deletions src/toil/test/src/resourceTest.py
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,6 @@ def _test(
# Assert basic attributes and properties
assert module.belongsToToil == shouldBelongToToil
assert module.name == module_name
if shouldBelongToToil:
assert module.dirPath.endswith("/src")

# Before the module is saved as a resource, localize() and globalize() are identity
# methods. This should log.warnings.
Expand Down
1 change: 1 addition & 0 deletions src/toil/test/utils/toilKillTest.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ class TestToilKill(_ToilKillTest):
"""A set of test cases for "toil kill"."""

@needs_cwl
@needs_aws_s3
def test_cwl_toil_kill(self, tmp_path: Path) -> None:
"""Test "toil kill" on a CWL workflow with a 100 second sleep."""
self._test_cwl_toil_kill(str(tmp_path / "job_store"))
Expand Down
Loading