Skip to content

Commit fdaf311

Browse files
committed
fix tests
1 parent d18084f commit fdaf311

1 file changed

Lines changed: 9 additions & 6 deletions

File tree

supportedBackends/sfs/src/test/scala/cromwell/backend/sfs/SharedFileSystemJobExecutionActorSpec.scala

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import org.scalatest.concurrent.PatienceConfiguration.Timeout
2626
import org.scalatest.prop.TableDrivenPropertyChecks
2727
import org.scalatest.{Assertion, FlatSpecLike, OptionValues}
2828
import wom.expression.NoIoFunctionSet
29-
import wom.graph.CommandCallNode
29+
import wom.graph.{CommandCallNode, WomIdentifier}
3030
import wom.types._
3131
import wom.values._
3232

@@ -40,10 +40,13 @@ class SharedFileSystemJobExecutionActorSpec extends TestKitSuite("SharedFileSyst
4040
lazy val runtimeAttributeDefinitions: Set[RuntimeAttributeDefinition] =
4141
StandardValidatedRuntimeAttributesBuilder.default(Some(TestConfig.optionalRuntimeConfig)).definitions.toSet
4242

43+
val call = CommandCallNode(WomIdentifier("SfsJEASpec_call"), null, null, null, Set.empty, null, None)
44+
val mockBackendJobDescriptorKey = BackendJobDescriptorKey(call, None, 1)
45+
4346
def executeSpec(docker: Boolean): Any = {
4447
val expectedOutputs: CallOutputs = WomMocks.mockOutputExpectations(Map("hello.salutation" -> WomString("Hello you !")))
45-
46-
val expectedResponse = JobSucceededResponse(mock[BackendJobDescriptorKey], Some(0), expectedOutputs, None, Seq.empty, None, resultGenerationMode = RunOnBackend)
48+
49+
val expectedResponse = JobSucceededResponse(mockBackendJobDescriptorKey, Some(0), expectedOutputs, None, Seq.empty, None, resultGenerationMode = RunOnBackend)
4750
val runtime = if (docker) """runtime { docker: "ubuntu:latest" }""" else ""
4851
val workflowDescriptor = buildWdlWorkflowDescriptor(HelloWorld, runtime = runtime)
4952
val workflow = TestWorkflow(workflowDescriptor, TestConfig.backendRuntimeConfigDescriptor, expectedResponse)
@@ -61,7 +64,7 @@ class SharedFileSystemJobExecutionActorSpec extends TestKitSuite("SharedFileSyst
6164

6265
it should "send back an execution failure if the task fails" in {
6366
val expectedResponse =
64-
JobFailedNonRetryableResponse(mock[BackendJobDescriptorKey], WrongReturnCode("wf_goodbye.goodbye:NA:1", 1, None), Option(1))
67+
JobFailedNonRetryableResponse(mockBackendJobDescriptorKey, WrongReturnCode("wf_goodbye.goodbye:NA:1", 1, None), Option(1))
6568
val workflow = TestWorkflow(buildWdlWorkflowDescriptor(GoodbyeWorld), TestConfig.backendRuntimeConfigDescriptor, expectedResponse)
6669
val backend = createBackend(jobDescriptorFromSingleCallWorkflow(workflow.workflowDescriptor, Map.empty, WorkflowOptions.empty, runtimeAttributeDefinitions), workflow.config)
6770
testWorkflow(workflow, backend)
@@ -259,7 +262,7 @@ class SharedFileSystemJobExecutionActorSpec extends TestKitSuite("SharedFileSyst
259262
BackendJobDescriptor(workflowDescriptor, BackendJobDescriptorKey(call, Option(shard), 1), runtimeAttributes, fqnWdlMapToDeclarationMap(symbolMaps), NoDocker, None, Map.empty)
260263
val backend = createBackend(jobDescriptor, TestConfig.backendRuntimeConfigDescriptor)
261264
val response =
262-
JobSucceededResponse(mock[BackendJobDescriptorKey], Some(0), WomMocks.mockOutputExpectations(Map("scattering.out" -> WomInteger(shard))), None, Seq.empty, None, resultGenerationMode = RunOnBackend)
265+
JobSucceededResponse(mockBackendJobDescriptorKey, Some(0), WomMocks.mockOutputExpectations(Map("scattering.out" -> WomInteger(shard))), None, Seq.empty, None, resultGenerationMode = RunOnBackend)
263266
executeJobAndAssertOutputs(backend, response)
264267
}
265268
}
@@ -286,7 +289,7 @@ class SharedFileSystemJobExecutionActorSpec extends TestKitSuite("SharedFileSyst
286289
}
287290

288291
it should "fail post processing if an output file is not found" in {
289-
val expectedResponse = JobFailedNonRetryableResponse(mock[BackendJobDescriptorKey],
292+
val expectedResponse = JobFailedNonRetryableResponse(mockBackendJobDescriptorKey,
290293
new FileNotFoundException("Could not process output, file not found:"), Option(0))
291294
val workflow = TestWorkflow(buildWdlWorkflowDescriptor(MissingOutputProcess), TestConfig.backendRuntimeConfigDescriptor, expectedResponse)
292295
val backend = createBackend(jobDescriptorFromSingleCallWorkflow(workflow.workflowDescriptor, Map.empty, WorkflowOptions.empty, runtimeAttributeDefinitions), workflow.config)

0 commit comments

Comments
 (0)