Skip to content

Commit

Permalink
Merge pull request #1420 from CloudSlang/support-multiple-workers
Browse files Browse the repository at this point in the history
fix tests
  • Loading branch information
QueueUpX authored Sep 6, 2023
2 parents a2523a6 + 24e626a commit 36a75dc
Show file tree
Hide file tree
Showing 9 changed files with 72 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,14 @@
import io.cloudslang.runtime.api.python.executor.services.PythonExecutorLifecycleManagerService;
import io.cloudslang.runtime.api.python.PythonRuntimeService;
import io.cloudslang.runtime.api.python.executor.entities.PythonExecutorDetails;
import io.cloudslang.runtime.api.python.executor.services.PythonExecutorProcessManagerService;
import io.cloudslang.runtime.impl.python.PythonExecutionCachedEngine;
import io.cloudslang.runtime.impl.python.PythonExecutionEngine;
import io.cloudslang.runtime.impl.python.PythonExecutionNotCachedEngine;
import io.cloudslang.runtime.impl.python.PythonRuntimeServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.ExternalPythonExecutorServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.PythonExecutorLifecycleManagerServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.PythonExecutorProcessManagerServiceImpl;
import io.cloudslang.runtime.impl.python.external.ExternalPythonExecutionEngine;
import io.cloudslang.runtime.impl.python.external.ExternalPythonRuntimeServiceImpl;
import io.cloudslang.score.events.EventBus;
Expand Down Expand Up @@ -476,7 +478,12 @@ public PythonExecutorCommunicationService pythonExecutorCommunicationService() {
@Bean(name = "pythonExecutorLifecycleManagerService")
public PythonExecutorLifecycleManagerService pythonExecutorLifecycleManagerService() {
return new PythonExecutorLifecycleManagerServiceImpl(pythonExecutorCommunicationService(),
pythonExecutorConfigurationDataService());
pythonExecutorConfigurationDataService(), pythonExecutorProcessManagerService());
}

@Bean(name = "pythonExecutorProcessManagerService")
public PythonExecutorProcessManagerService pythonExecutorProcessManagerService() {
return mock(PythonExecutorProcessManagerService.class);
}

@Bean(name = "externalPythonExecutorService")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,13 @@
import io.cloudslang.runtime.api.python.executor.services.PythonExecutorLifecycleManagerService;
import io.cloudslang.runtime.api.python.PythonRuntimeService;
import io.cloudslang.runtime.api.python.executor.entities.PythonExecutorDetails;
import io.cloudslang.runtime.api.python.executor.services.PythonExecutorProcessManagerService;
import io.cloudslang.runtime.impl.python.PythonExecutionCachedEngine;
import io.cloudslang.runtime.impl.python.PythonExecutionEngine;
import io.cloudslang.runtime.impl.python.PythonRuntimeServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.ExternalPythonExecutorServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.PythonExecutorLifecycleManagerServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.PythonExecutorProcessManagerServiceImpl;
import io.cloudslang.runtime.impl.python.external.ExternalPythonExecutionEngine;
import io.cloudslang.runtime.impl.python.external.ExternalPythonRuntimeServiceImpl;
import io.cloudslang.score.events.EventBus;
Expand Down Expand Up @@ -575,7 +577,12 @@ public PythonExecutorCommunicationService pythonExecutorCommunicationService() {
@Bean(name = "pythonExecutorLifecycleManagerService")
public PythonExecutorLifecycleManagerService pythonExecutorLifecycleManagerService() {
return new PythonExecutorLifecycleManagerServiceImpl(pythonExecutorCommunicationService(),
pythonExecutorConfigurationDataService());
pythonExecutorConfigurationDataService(), pythonExecutorProcessManagerService());
}

@Bean(name = "pythonExecutorProcessManagerService")
public PythonExecutorProcessManagerService pythonExecutorProcessManagerService() {
return mock(PythonExecutorProcessManagerService.class);
}

@Bean(name = "externalPythonExecutorService")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,13 @@
import io.cloudslang.runtime.api.python.executor.services.PythonExecutorLifecycleManagerService;
import io.cloudslang.runtime.api.python.PythonRuntimeService;
import io.cloudslang.runtime.api.python.executor.entities.PythonExecutorDetails;
import io.cloudslang.runtime.api.python.executor.services.PythonExecutorProcessManagerService;
import io.cloudslang.runtime.impl.python.PythonExecutionCachedEngine;
import io.cloudslang.runtime.impl.python.PythonExecutionEngine;
import io.cloudslang.runtime.impl.python.PythonRuntimeServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.ExternalPythonExecutorServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.PythonExecutorLifecycleManagerServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.PythonExecutorProcessManagerServiceImpl;
import io.cloudslang.runtime.impl.python.external.ExternalPythonExecutionEngine;
import io.cloudslang.runtime.impl.python.external.ExternalPythonRuntimeServiceImpl;
import io.cloudslang.score.events.EventBus;
Expand Down Expand Up @@ -283,7 +285,12 @@ public PythonExecutorCommunicationService pythonExecutorCommunicationService() {
@Bean(name = "pythonExecutorLifecycleManagerService")
public PythonExecutorLifecycleManagerService pythonExecutorLifecycleManagerService() {
return new PythonExecutorLifecycleManagerServiceImpl(pythonExecutorCommunicationService(),
pythonExecutorConfigurationDataService());
pythonExecutorConfigurationDataService(), pythonExecutorProcessManagerService());
}

@Bean(name = "pythonExecutorProcessManagerService")
public PythonExecutorProcessManagerService pythonExecutorProcessManagerService() {
return mock(PythonExecutorProcessManagerService.class);
}

@Bean(name = "externalPythonExecutorService")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,13 @@
import io.cloudslang.runtime.api.python.executor.services.PythonExecutorLifecycleManagerService;
import io.cloudslang.runtime.api.python.PythonRuntimeService;
import io.cloudslang.runtime.api.python.executor.entities.PythonExecutorDetails;
import io.cloudslang.runtime.api.python.executor.services.PythonExecutorProcessManagerService;
import io.cloudslang.runtime.impl.python.PythonExecutionCachedEngine;
import io.cloudslang.runtime.impl.python.PythonExecutionEngine;
import io.cloudslang.runtime.impl.python.PythonRuntimeServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.ExternalPythonExecutorServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.PythonExecutorLifecycleManagerServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.PythonExecutorProcessManagerServiceImpl;
import io.cloudslang.runtime.impl.python.external.ExternalPythonExecutionEngine;
import io.cloudslang.runtime.impl.python.external.ExternalPythonRuntimeServiceImpl;
import io.cloudslang.score.events.EventBus;
Expand Down Expand Up @@ -260,7 +262,12 @@ public PythonExecutorCommunicationService pythonExecutorCommunicationService() {
@Bean(name = "pythonExecutorLifecycleManagerService")
public PythonExecutorLifecycleManagerService pythonExecutorLifecycleManagerService() {
return new PythonExecutorLifecycleManagerServiceImpl(pythonExecutorCommunicationService(),
pythonExecutorConfigurationDataService());
pythonExecutorConfigurationDataService(), pythonExecutorProcessManagerService());
}

@Bean(name = "pythonExecutorProcessManagerService")
public PythonExecutorProcessManagerService pythonExecutorProcessManagerService() {
return mock(PythonExecutorProcessManagerService.class);
}

@Bean(name = "externalPythonExecutorService")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,13 @@
import io.cloudslang.runtime.api.python.executor.services.PythonExecutorLifecycleManagerService;
import io.cloudslang.runtime.api.python.PythonRuntimeService;
import io.cloudslang.runtime.api.python.executor.entities.PythonExecutorDetails;
import io.cloudslang.runtime.api.python.executor.services.PythonExecutorProcessManagerService;
import io.cloudslang.runtime.impl.python.PythonExecutionCachedEngine;
import io.cloudslang.runtime.impl.python.PythonExecutionEngine;
import io.cloudslang.runtime.impl.python.PythonExecutor;
import io.cloudslang.runtime.impl.python.executor.services.ExternalPythonExecutorServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.PythonExecutorLifecycleManagerServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.PythonExecutorProcessManagerServiceImpl;
import io.cloudslang.runtime.impl.python.external.ExternalPythonExecutionEngine;
import io.cloudslang.runtime.impl.python.external.ExternalPythonRuntimeServiceImpl;
import io.cloudslang.score.events.EventBus;
Expand Down Expand Up @@ -226,7 +228,12 @@ public PythonExecutorCommunicationService pythonExecutorCommunicationService() {
@Bean(name = "pythonExecutorLifecycleManagerService")
public PythonExecutorLifecycleManagerService pythonExecutorLifecycleManagerService() {
return new PythonExecutorLifecycleManagerServiceImpl(pythonExecutorCommunicationService(),
pythonExecutorConfigurationDataService());
pythonExecutorConfigurationDataService(), pythonExecutorProcessManagerService());
}

@Bean(name = "pythonExecutorProcessManagerService")
public PythonExecutorProcessManagerService pythonExecutorProcessManagerService() {
return mock(PythonExecutorProcessManagerService.class);
}

@Bean(name = "externalPythonExecutorService")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,14 @@
import io.cloudslang.runtime.api.python.executor.services.PythonExecutorLifecycleManagerService;
import io.cloudslang.runtime.api.python.PythonRuntimeService;
import io.cloudslang.runtime.api.python.executor.entities.PythonExecutorDetails;
import io.cloudslang.runtime.api.python.executor.services.PythonExecutorProcessManagerService;
import io.cloudslang.runtime.impl.python.PythonExecutionCachedEngine;
import io.cloudslang.runtime.impl.python.PythonExecutionEngine;
import io.cloudslang.runtime.impl.python.PythonExecutor;
import io.cloudslang.runtime.impl.python.PythonRuntimeServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.ExternalPythonExecutorServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.PythonExecutorLifecycleManagerServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.PythonExecutorProcessManagerServiceImpl;
import io.cloudslang.runtime.impl.python.external.ExternalPythonExecutionEngine;
import io.cloudslang.runtime.impl.python.external.ExternalPythonRuntimeServiceImpl;
import io.cloudslang.score.events.EventBus;
Expand Down Expand Up @@ -216,7 +218,12 @@ public PythonExecutorCommunicationService pythonExecutorCommunicationService() {
@Bean(name = "pythonExecutorLifecycleManagerService")
public PythonExecutorLifecycleManagerService pythonExecutorLifecycleManagerService() {
return new PythonExecutorLifecycleManagerServiceImpl(pythonExecutorCommunicationService(),
pythonExecutorConfigurationDataService());
pythonExecutorConfigurationDataService(), pythonExecutorProcessManagerService());
}

@Bean(name = "pythonExecutorProcessManagerService")
public PythonExecutorProcessManagerService pythonExecutorProcessManagerService() {
return mock(PythonExecutorProcessManagerService.class);
}

@Bean(name = "externalPythonExecutorService")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,13 @@
import io.cloudslang.runtime.api.python.executor.services.PythonExecutorLifecycleManagerService;
import io.cloudslang.runtime.api.python.PythonRuntimeService;
import io.cloudslang.runtime.api.python.executor.entities.PythonExecutorDetails;
import io.cloudslang.runtime.api.python.executor.services.PythonExecutorProcessManagerService;
import io.cloudslang.runtime.impl.python.PythonExecutionCachedEngine;
import io.cloudslang.runtime.impl.python.PythonExecutionEngine;
import io.cloudslang.runtime.impl.python.PythonRuntimeServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.ExternalPythonExecutorServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.PythonExecutorLifecycleManagerServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.PythonExecutorProcessManagerServiceImpl;
import io.cloudslang.runtime.impl.python.external.ExternalPythonExecutionEngine;
import io.cloudslang.runtime.impl.python.external.ExternalPythonRuntimeServiceImpl;
import io.cloudslang.score.api.execution.precondition.ExecutionPreconditionService;
Expand Down Expand Up @@ -532,7 +534,12 @@ public PythonRuntimeService externalPythonExecutorService() {
@Bean(name = "pythonExecutorLifecycleManagerService")
public PythonExecutorLifecycleManagerService pythonExecutorLifecycleManagerService() {
return new PythonExecutorLifecycleManagerServiceImpl(pythonExecutorCommunicationService(),
pythonExecutorConfigurationDataService());
pythonExecutorConfigurationDataService(), pythonExecutorProcessManagerService());
}

@Bean(name = "pythonExecutorProcessManagerService")
public PythonExecutorProcessManagerService pythonExecutorProcessManagerService() {
return mock(PythonExecutorProcessManagerService.class);
}

@Bean(name = "externalPythonRuntimeService")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,13 @@
import io.cloudslang.runtime.api.python.executor.services.PythonExecutorLifecycleManagerService;
import io.cloudslang.runtime.api.python.PythonRuntimeService;
import io.cloudslang.runtime.api.python.executor.entities.PythonExecutorDetails;
import io.cloudslang.runtime.api.python.executor.services.PythonExecutorProcessManagerService;
import io.cloudslang.runtime.impl.python.PythonExecutionCachedEngine;
import io.cloudslang.runtime.impl.python.PythonExecutionEngine;
import io.cloudslang.runtime.impl.python.PythonRuntimeServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.ExternalPythonExecutorServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.PythonExecutorLifecycleManagerServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.PythonExecutorProcessManagerServiceImpl;
import io.cloudslang.runtime.impl.python.external.ExternalPythonExecutionEngine;
import io.cloudslang.score.api.EndBranchDataContainer;
import io.cloudslang.score.events.EventBus;
Expand Down Expand Up @@ -623,7 +625,12 @@ public PythonExecutorCommunicationService pythonExecutorCommunicationService() {
@Bean(name = "pythonExecutorLifecycleManagerService")
public PythonExecutorLifecycleManagerService pythonExecutorLifecycleManagerService() {
return new PythonExecutorLifecycleManagerServiceImpl(pythonExecutorCommunicationService(),
pythonExecutorConfigurationDataService());
pythonExecutorConfigurationDataService(), pythonExecutorProcessManagerService());
}

@Bean(name = "pythonExecutorProcessManagerService")
public PythonExecutorProcessManagerService pythonExecutorProcessManagerService() {
return mock(PythonExecutorProcessManagerService.class);
}

@Bean(name = "externalPythonRuntimeService")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,13 @@
import io.cloudslang.runtime.api.python.executor.services.PythonExecutorLifecycleManagerService;
import io.cloudslang.runtime.api.python.PythonRuntimeService;
import io.cloudslang.runtime.api.python.executor.entities.PythonExecutorDetails;
import io.cloudslang.runtime.api.python.executor.services.PythonExecutorProcessManagerService;
import io.cloudslang.runtime.impl.python.PythonExecutionCachedEngine;
import io.cloudslang.runtime.impl.python.PythonExecutionEngine;
import io.cloudslang.runtime.impl.python.PythonRuntimeServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.ExternalPythonExecutorServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.PythonExecutorLifecycleManagerServiceImpl;
import io.cloudslang.runtime.impl.python.executor.services.PythonExecutorProcessManagerServiceImpl;
import io.cloudslang.runtime.impl.python.external.ExternalPythonExecutionEngine;
import io.cloudslang.runtime.impl.python.external.ExternalPythonRuntimeServiceImpl;
import io.cloudslang.score.events.EventBus;
Expand Down Expand Up @@ -659,7 +661,12 @@ public PythonExecutorCommunicationService pythonExecutorCommunicationService() {
@Bean(name = "pythonExecutorLifecycleManagerService")
public PythonExecutorLifecycleManagerService pythonExecutorLifecycleManagerService() {
return new PythonExecutorLifecycleManagerServiceImpl(pythonExecutorCommunicationService(),
pythonExecutorConfigurationDataService());
pythonExecutorConfigurationDataService(), pythonExecutorProcessManagerService());
}

@Bean(name = "pythonExecutorProcessManagerService")
public PythonExecutorProcessManagerService pythonExecutorProcessManagerService() {
return mock(PythonExecutorProcessManagerService.class);
}

@Bean(name = "externalPythonExecutorService")
Expand Down

0 comments on commit 36a75dc

Please sign in to comment.