Skip to content

Configure pipeline tools directory with additional.pipeline.tools #2224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-tchad merged 2 commits into from
Jan 10, 2025
Merged

Configure pipeline tools directory with additional.pipeline.tools #2224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
750cb07
Use 'additional.pipeline.tools' for all tests
labkey-tchad Jan 9, 2025
4680f64
Avoid setting tools dir unnecessarily
labkey-tchad Jan 9, 2025
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 src/org/labkey/test/BaseWebDriverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
import org.labkey.test.util.LogMethod;
import org.labkey.test.util.LoggedParam;
import org.labkey.test.util.PermissionsHelper;
import org.labkey.test.util.PipelineToolsHelper;
import org.labkey.test.util.ReadOnlyTest;
import org.labkey.test.util.SecurityHelper;
import org.labkey.test.util.SimpleHttpResponse;
Expand Down Expand Up @@ -691,6 +692,8 @@ private void doPreamble()
}

cleanup(false);

new PipelineToolsHelper(this).resetPipelineToolsDirectory();
}

private void enableTroubleshootingStacktraces()
Expand Down
22 changes: 9 additions & 13 deletions src/org/labkey/test/util/PipelineToolsHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@

public class PipelineToolsHelper
{
private LabKeySiteWrapper _test;
private static Set<String> _originalToolsDirs = null;
private static Set<String> _currentToolsDirs = null;
private final LabKeySiteWrapper _test;
private static final String _defaultToolsDirectory = new File(TestFileUtils.getModulesDir().getParentFile(), "bin").getAbsoluteFile().toString();
private static final String _extraPipelineTools = TestProperties.getAdditionalPipelineTools();
private static Set<String> _originalToolsDirs = null;
private static Set<String> _currentToolsDirs = Set.of(_defaultToolsDirectory); // Presume current tools dir is just the default dir

public PipelineToolsHelper(LabKeySiteWrapper test)
{
Expand Down Expand Up @@ -90,7 +90,7 @@ public void addToPipelineToolsPath(@LoggedParam String... directories)
Set<String> directoriesToAppend = new LinkedHashSet<>(Arrays.asList(directories));
directoriesToAppend.remove("");
directoriesToAppend.remove(null);
if (directoriesToAppend.isEmpty() || _currentToolsDirs != null && _currentToolsDirs.containsAll(directoriesToAppend))
if (directoriesToAppend.isEmpty() || _currentToolsDirs.containsAll(directoriesToAppend))
{
TestLogger.log("No changes needed");
return;
Expand Down Expand Up @@ -125,14 +125,10 @@ public void addToPipelineToolsPath(@LoggedParam String... directories)
@LogMethod
public void resetPipelineToolsDirectory()
{
if (_originalToolsDirs != null)
{
if (TestProperties.isTestRunningOnTeamCity())
setToolsDirToTestDefault();
else
setPipelineToolsDirectory(pathFromDirs(_originalToolsDirs));
_originalToolsDirs = null;
}
if (TestProperties.isTestRunningOnTeamCity())
setToolsDirToTestDefault();
else if (_originalToolsDirs != null)
setPipelineToolsDirectory(pathFromDirs(_originalToolsDirs));
}

/**
Expand All @@ -143,7 +139,7 @@ public void setToolsDirToTestDefault()
{
setPipelineToolsDirectory(getDefaultToolsPath());
if (TestProperties.isTestRunningOnTeamCity())
_originalToolsDirs = null;
_originalToolsDirs = _currentToolsDirs; // Don't remove 'additional.pipeline.tools' between tests
}

private void goToSiteSettings()
Expand Down
Loading