does this fix tests?

broadinstitute · Aug 21, 2024 · f947f75 · f947f75
1 parent da33ebc
commit f947f75
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 16 deletions.
diff --git a/...st/scala/cromwell/engine/workflow/lifecycle/execution/SubWorkflowExecutionActorSpec.scala b/...st/scala/cromwell/engine/workflow/lifecycle/execution/SubWorkflowExecutionActorSpec.scala
@@ -66,6 +66,7 @@ class SubWorkflowExecutionActorSpec
   private var parentProbe: TestProbe = _
   private val parentBackendDescriptor = mock[BackendWorkflowDescriptor]
   private val parentWorkflowId: WorkflowId = WorkflowId.randomId()
+  private var groupMetricsProbe: TestProbe = _
 
   parentBackendDescriptor.id returns parentWorkflowId
   private val parentWorkflowDescriptor = EngineWorkflowDescriptor(
@@ -97,6 +98,7 @@ class SubWorkflowExecutionActorSpec
     subWorkflowActor = TestProbe()
     deathWatch = TestProbe()
     parentProbe = TestProbe()
+    groupMetricsProbe = TestProbe()
   }
 
   private def buildSWEA(startState: StartableState = Submitted) =
@@ -124,7 +126,7 @@ class SubWorkflowExecutionActorSpec
           new AtomicInteger(),
           fileHashCacheActor = None,
           blacklistCache = None,
-          groupMetricsActor = system.actorOf(Props.empty, "TestGroupMetricsActor")
+          groupMetricsActor = groupMetricsProbe.ref
         ) {
           override def createSubWorkflowPreparationActor(subWorkflowId: WorkflowId): ActorRef = preparationActor.ref
           override def createSubWorkflowActor(createSubWorkflowActor: EngineWorkflowDescriptor): ActorRef =

diff --git a/getm-manifest.json b/getm-manifest.json
diff --git a/server/src/test/scala/cromwell/SimpleWorkflowActorSpec.scala b/server/src/test/scala/cromwell/SimpleWorkflowActorSpec.scala
@@ -92,7 +92,7 @@ class SimpleWorkflowActorSpec extends CromwellTestKitWordSpec with BeforeAndAfte
         totalJobsByRootWf = new AtomicInteger(),
         fileHashCacheActorProps = None,
         blacklistCache = None,
-        groupMetricsActor = system.actorOf(Props.empty, "TestGroupMetricsActor")
+        groupMetricsActor = system.actorOf(Props.empty, s"group-metrics-actor-$workflowId-${UUID.randomUUID()}")
       ),
       supervisor = supervisor.ref,
       name = s"workflow-actor-$workflowId"

diff --git a/...Backends/aws/src/test/scala/cromwell/backend/impl/aws/AwsBatchJobExecutionActorSpec.scala b/...Backends/aws/src/test/scala/cromwell/backend/impl/aws/AwsBatchJobExecutionActorSpec.scala
@@ -80,7 +80,7 @@ class AwsBatchJobExecutionActorSpec extends TestKitSuite with AnyFlatSpecLike wi
       Option(initializationData),
       backendSingletonActor,
       classOf[AwsBatchAsyncBackendJobExecutionActor],
-      groupMetricsActor = system.actorOf(Props.empty, "TestGroupMetricsActor"),
+      groupMetricsActor = system.actorOf(Props.empty, "groupMetricsActor-initialization"),
       MinimumRuntimeSettings()
     )
     val testJJEA = TestActorRef[TestAwsBatchJobExecutionActor](
@@ -124,7 +124,7 @@ class AwsBatchJobExecutionActorSpec extends TestKitSuite with AnyFlatSpecLike wi
       Option(initializationData),
       backendSingletonActor,
       classOf[AwsBatchAsyncBackendJobExecutionActor],
-      groupMetricsActor = system.actorOf(Props.empty, "TestGroupMetricsActor"),
+      groupMetricsActor = system.actorOf(Props.empty, "groupMetricsActor-random"),
       MinimumRuntimeSettings()
     )
     val testJJEA = TestActorRef[TestAwsBatchJobExecutionActor](

diff --git a/...st/scala/cromwell/backend/google/pipelines/common/PipelinesApiJobExecutionActorSpec.scala b/...st/scala/cromwell/backend/google/pipelines/common/PipelinesApiJobExecutionActorSpec.scala
@@ -49,7 +49,7 @@ class PipelinesApiJobExecutionActorSpec extends TestKitSuite with AnyFlatSpecLik
       Option(initializationData),
       jesBackendSingletonActor,
       classOf[PipelinesApiAsyncBackendJobExecutionActor],
-      groupMetricsActor = system.actorOf(Props.empty, "TestGroupMetricsActor"),
+      groupMetricsActor = system.actorOf(Props.empty, "groupMetricsActor-initialization"),
       MinimumRuntimeSettings()
     )
     val testJJEA = TestActorRef[TestPipelinesApiJobExecutionActor](
@@ -93,7 +93,7 @@ class PipelinesApiJobExecutionActorSpec extends TestKitSuite with AnyFlatSpecLik
       Option(initializationData),
       jesBackendSingletonActor,
       classOf[PipelinesApiAsyncBackendJobExecutionActor],
-      groupMetricsActor = system.actorOf(Props.empty, "TestGroupMetricsActor"),
+      groupMetricsActor = system.actorOf(Props.empty, "groupMetricsActor-random"),
       MinimumRuntimeSettings()
     )
     val testJJEA = TestActorRef[TestPipelinesApiJobExecutionActor](