Skip to content

Don't always fail test for missing sample data #7135

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 1 commit into from
Oct 20, 2025
Merged

Don't always fail test for missing sample data #7135

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 14 additions & 10 deletions api/src/org/labkey/api/util/JunitUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,22 +233,26 @@ public static void createRaces(final Runnable runnable, final int threads, final
}

sampleDataDir = _sampleDataDirectories.get(name);

if (sampleDataDir == null)
{
Assert.fail("Sample data directory not found for module: " + name + ". Known directories: " + _sampleDataDirectories);
}
}
}
}

File file = FileUtil.appendPath(sampleDataDir, Path.parse(relativePath));
if (file.exists())
return file;
String message;

if (sampleDataDir != null)
{
File file = FileUtil.appendPath(sampleDataDir, Path.parse(relativePath));
if (file.exists())
return file;

String message = "No sample data found at [" + file.getAbsolutePath() + "].";
message = "No sample data found at [" + file.getAbsolutePath() + "].";
}
else
{
message = "No sample data found at [" + relativePath + "].";
}

if (null != module)
if (module != null)
{
if (sampleDataDir == null || !sampleDataDir.exists())
{
Expand Down