Skip to content

Fix RealDataTestsBase cross-worktree test collisions #979

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

Open
johnml1135 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix RealDataTestsBase cross-worktree test collisions #979

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b954ba
Fix RealDataTestsBase cross-worktree test collisions
johnml1135 Jul 1, 2026
0b558be
Fix DbDirectory() to match where CreateNewLangProj creates projects
johnml1135 Jul 7, 2026
4ad271e
Trim DbDirectory() comment to match repo comment convention
johnml1135 Jul 7, 2026
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
21 changes: 18 additions & 3 deletions Src/Common/RootSite/RootSiteTests/RealDataTestsBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
using System;
using System.IO;
using System.Security.Cryptography;
using System.Text;
using System.Threading;
using NUnit.Framework;
using SIL.FieldWorks.Common.FwUtils;
Expand All @@ -20,11 +22,22 @@ namespace SIL.FieldWorks.Common.RootSites.RootSiteTests
[TestFixture]
public abstract class RealDataTestsBase
{
private const string ReusableProjectName = "integration_test_data";
private const string ProjectMutexName =
@"Local\FieldWorks.RealDataTests.integration_test_data";
// The project name must be unique per worktree, so that multiple worktrees of the same repo
// can run tests in parallel without colliding on the same project directory.
private static readonly string ReusableProjectName = "integration_test_data_" + WorktreeSuffix();
private static readonly string ProjectMutexName =
@"Local\FieldWorks.RealDataTests." + ReusableProjectName;
private const string TestProjectSentinelFileName = ".fieldworks-real-data-test-project";

private static string WorktreeSuffix()
{
using (var sha = SHA1.Create())
{
var hash = sha.ComputeHash(Encoding.UTF8.GetBytes(FwDirectoryFinder.SourceDirectory));
return BitConverter.ToString(hash, 0, 4).Replace("-", string.Empty).ToLowerInvariant();
}
}

protected FwNewLangProjectModel m_model;
protected LcmCache Cache;
protected string m_dbName;
Expand Down Expand Up @@ -138,6 +151,8 @@ public virtual void TestTearDown()

protected string DbDirectory(string name)
{
// CreateNewLangProj always creates here and can't be redirected; collision avoidance
// across worktrees comes from ReusableProjectName's worktree-hash suffix instead.
return Path.Combine(FwDirectoryFinder.ProjectsDirectory, name);
}

Expand Down
Loading