Skip to content

Commit

Permalink
Issue 48499: Use preferred SecurityPolicyManager.savePolicy() variant (
Browse files Browse the repository at this point in the history
  • Loading branch information
labkey-jeckels authored Aug 29, 2023
1 parent 605b938 commit c39f04c
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -893,7 +893,7 @@ public void doSetup() throws Exception
Container project = ContainerManager.getForPath(PROJECT_NAME);
if (project == null)
{
project = ContainerManager.createContainer(ContainerManager.getRoot(), PROJECT_NAME);
project = ContainerManager.createContainer(ContainerManager.getRoot(), PROJECT_NAME, TestContext.get().getUser());
Set<Module> modules = new HashSet<>();
modules.addAll(project.getActiveModules());
modules.add(ModuleLoader.getInstance().getModule(OpenLdapSyncModule.NAME));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ protected static void doInitialSetUp(String projectName) throws Exception
Container project = ContainerManager.getForPath(projectName);
if (project == null)
{
project = ContainerManager.createContainer(ContainerManager.getRoot(), projectName);
project = ContainerManager.createContainer(ContainerManager.getRoot(), projectName, TestContext.get().getUser());

//disable search so we dont get conflicts when deleting folder quickly
ContainerManager.updateSearchable(project, false, TestContext.get().getUser());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ public static void before() throws Exception
Container project = ContainerManager.getForPath(PROJECT_NAME);
if (project == null)
{
project = ContainerManager.createContainer(ContainerManager.getRoot(), PROJECT_NAME);
project = ContainerManager.createContainer(ContainerManager.getRoot(), PROJECT_NAME, TestContext.get().getUser());
Set<Module> modules = new HashSet<>();
modules.addAll(project.getActiveModules());
modules.add(ModuleLoader.getInstance().getModule(SequenceAnalysisModule.NAME));
Expand Down
10 changes: 5 additions & 5 deletions cluster/src/org/labkey/cluster/pipeline/TestCase.java
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public static void initialSetUp() throws Exception
Container project = ContainerManager.getForPath(PROJECT_NAME);
if (project == null)
{
project = ContainerManager.createContainer(ContainerManager.getRoot(), PROJECT_NAME);
project = ContainerManager.createContainer(ContainerManager.getRoot(), PROJECT_NAME, TestContext.get().getUser());
Set<Module> modules = new HashSet<>();
modules.addAll(project.getActiveModules());
modules.add(ModuleLoader.getInstance().getModule(ClusterModule.class));
Expand Down Expand Up @@ -102,19 +102,19 @@ protected static void doCleanup(String projectName)
public void basicTest() throws Exception
{
Container c = ContainerManager.getForPath(PROJECT_NAME);
for (RemoteExecutionEngine engine : PipelineJobService.get().getRemoteExecutionEngines())
for (RemoteExecutionEngine<?> engine : PipelineJobService.get().getRemoteExecutionEngines())
{
_log.info("testing engine: " + engine.getType());
if (engine instanceof AbstractClusterExecutionEngine)
if (engine instanceof AbstractClusterExecutionEngine<?> acee)
{
runTestJob(c, TestContext.get().getUser(), (AbstractClusterExecutionEngine) engine);
runTestJob(c, TestContext.get().getUser(), acee);
}
}
}

public static class TestRunner implements ClusterService.ClusterRemoteTask
{
public long _sleep = 0;
public long _sleep = 0l;

public TestRunner(long sleep)
{
Expand Down

0 comments on commit c39f04c

Please sign in to comment.