* Removed obsoletes from IConfigManipulator. * Removed obsolete models builder extensions. * Removed the obsolete ContentDashboardSettings. * Removed the obsolete InstallMissingDatabase setting on GlobalSettings. * Removed obsolete NuCache settings. * Removed obsolete RuntimeMinificationSettings. * Removed obsolete health check constant. * Removed obsolete icon constant. * Removed obsolete telemetry constant. * Removed obsolete property and constructor on UmbracoBuilder. * Removed obsolete constructor on AuditNotificationsHandler. * Removed obsolete constructor on HTTP header health checks. * Removed obsolete constructor on MediaFileManager. * Removed obsolete GetDefaultFileContent on ViewHelper. * Remove obsoleted methods on embed providers. * Fix tests. * Removed obsolete constructors on BlockEditorDataConverter. * Removed obsolete SeedCacheDuration property on CacheSettings. * Removed obsolete PublishCulture on ContentRepositoryExtensions. * Removed obsolete MonitorLock. * Removed obsolete synchronous HasSavedValues from IDataTypeUsageService and IDataTypeUsageRepository. * Removed obsolete HasSavedPropertyValues from IPropertyTypeUsageService and IPropertyTypeUsageRepository. * Removed obsolete methods in ITrackedReferencesService and ITrackedReferencesRepository. * Removed obsolete DateValueEditor constructors. * Removed obsolete GetAutomaticRelationTypesAliases. * Removed obsolete constructor on TextOnlyValueEditor. * Removed obsolete constructors on RegexValidator and RequiredValidator. * Removed obsolete constructs on SliderValueConverter and TagsValueConverter. * Removed obsolete GetContentType methods from IPublishedCache. * Removed ContentFinderByIdPath. * Removed obsolete constructor on DefaultMediaUrlProvider. * Removed obsolete constructor on Domain. * Removed obsolete constructor on PublishedRequest. * Removed obsolete methods on CheckPermissions. * Removed obsolete GetUserId from IBackOfficeSecurity. * Removed obsolete methods on LegacyPasswordSecurity. * Removed obsolete constructors on AuditService. * Removed obsolete methods on IContentEditingService. * Remove obsolete constructors and methods on ContentService/IContentService. * Removed obsolete constructor in ContentTypeEditingService. * Removed obsolete constructor in MediaTypeEditingService. * Removed obsolete constructor in MemberTypeEditingService. * Removed obsolete constructor in ContentTypeService. * Removed obsolete constructors in ContentTypeServiceBase. * Removed obsolete constructors and methods in ContentVersionService. * Removed obsolete constructor in DataTypeUsageService. * Removed obsolete constructor in DomainService. * Removed obsolete constructor in FileService. * Removes obsolete AttemptMove from IContentService. * Removes obsolete SetPreventCleanup from IContentVersionService. * Removes obsolete GetReferences from IDataTypeService. * Removed obsolete SetConsentLevel from IMetricsConsentService. * Removed obsolete methods from IPackageDataInstallation. * Removed obsolete methods from IPackagingService. * Removed obsolete methods on ITwoFactorLoginService. Removed obsolete ITemporaryMediaService. * Removed obsolete constructor from MediaService, MemberTypeService and MediaTypeService. * More obsolete constructors. * Removed obsoleted overloads on IPropertyValidationService. * Fixed build for tests. * Removed obsolete constructor for PublicAccessService, UserService and RelationService. * Removed GetDefaultMemberType. * Removed obsolete user group functionality from IUserService. * Removed obsolete extension methods on IUserService. * Removed obsolete method from ITelemetryService. * Removed obsolete UdiParserServiceConnectors. * Removed obsolete method on ICookieManager. * Removed obsolete DynamicContext. * Removed obsolete XmlHelper. * Fixed failing integration tests. * Removed obsoletes in Umbraco.Cms.Api.Common * Removed obsoletes in Umbraco.Cms.Api.Delivery * Removed obsoletes in Umbraco.Cms.Api.Management * Removed obsoletes in Umbraco.Examine.Lucene * Removed obsoletes in Umbraco.Infrastructure * Fix failing delivery API contract integration test. * Made integration tests internal. * Removed obsoletes from web projects. * Fix build. * Removed Twitter OEmbed provider * Removed obsolete constructor on PublishedDataType. * Removed obsolete constructors on PublishedCacheBase. * Removed the obsolete PropertyEditorTagsExtensions. * Removed obsoletion properties on configuration response models (#18697) * Removed obsolete methods from server-side models. * Update client-side types and sdk. * Update client-side files. * Removed obsoletion of Utf8ToAsciiConverter.ToAsciiString overload. (#18694) * Removed obsolete method in UserService. (#18710) * Removed obsoleted group alias keys from being publicly available. (#18682) * Removed unneceessary ApiVersion attribute. * Clean-up obsoletions on MemberService (#18703) * Removed obsoleted method on MemberService, added future obsoletion to interface and updated all callers. * Removed obsoletion on member service method that's not obsolete on the interface.
114 lines
3.2 KiB
C#
114 lines
3.2 KiB
C#
using System.IO;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using Microsoft.Extensions.Logging;
|
|
using Microsoft.Extensions.Options;
|
|
using Moq;
|
|
using NUnit.Framework;
|
|
using Umbraco.Cms.Core.Configuration.Models;
|
|
using Umbraco.Cms.Core.Hosting;
|
|
using Umbraco.Cms.Core.Runtime;
|
|
using Umbraco.Cms.Infrastructure.Runtime;
|
|
using Umbraco.Cms.Tests.Common.Attributes;
|
|
using Umbraco.Cms.Tests.Integration.Testing;
|
|
|
|
namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Runtime;
|
|
|
|
[TestFixture]
|
|
internal sealed class FileSystemMainDomLockTests : UmbracoIntegrationTest
|
|
{
|
|
[SetUp]
|
|
public void SetUp()
|
|
{
|
|
MainDomKeyGenerator = GetRequiredService<IMainDomKeyGenerator>();
|
|
HostingEnvironment = GetRequiredService<IHostingEnvironment>();
|
|
|
|
var lockFileName = $"MainDom_{MainDomKeyGenerator.GenerateKey()}.lock";
|
|
LockFilePath = Path.Combine(HostingEnvironment.LocalTempPath, lockFileName);
|
|
LockReleaseFilePath = LockFilePath + "_release";
|
|
|
|
var globalSettings = Mock.Of<IOptionsMonitor<GlobalSettings>>();
|
|
Mock.Get(globalSettings).Setup(x => x.CurrentValue).Returns(new GlobalSettings());
|
|
|
|
var log = GetRequiredService<ILogger<FileSystemMainDomLock>>();
|
|
FileSystemMainDomLock = new FileSystemMainDomLock(log, MainDomKeyGenerator, HostingEnvironment, globalSettings);
|
|
}
|
|
|
|
[TearDown]
|
|
public void TearDown()
|
|
{
|
|
CleanupTestFile(LockFilePath);
|
|
CleanupTestFile(LockReleaseFilePath);
|
|
}
|
|
|
|
private IMainDomKeyGenerator MainDomKeyGenerator { get; set; }
|
|
|
|
private IHostingEnvironment HostingEnvironment { get; set; }
|
|
|
|
private FileSystemMainDomLock FileSystemMainDomLock { get; set; }
|
|
|
|
private string LockFilePath { get; set; }
|
|
private string LockReleaseFilePath { get; set; }
|
|
|
|
private static void CleanupTestFile(string path)
|
|
{
|
|
for (var i = 0; i < 3; i++)
|
|
{
|
|
try
|
|
{
|
|
File.Delete(path);
|
|
return;
|
|
}
|
|
catch
|
|
{
|
|
Thread.Sleep(500 * (i + 1));
|
|
}
|
|
}
|
|
}
|
|
|
|
[Test]
|
|
public async Task AcquireLockAsync_WhenNoOtherHoldsLockFileHandle_ReturnsTrue()
|
|
{
|
|
using var sut = FileSystemMainDomLock;
|
|
|
|
var result = await sut.AcquireLockAsync(1000);
|
|
|
|
Assert.True(result);
|
|
}
|
|
|
|
[Test]
|
|
[LongRunning]
|
|
public async Task AcquireLockAsync_WhenTimeoutExceeded_ReturnsFalse()
|
|
{
|
|
await using var lockFile = File.Open(LockFilePath, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
|
|
|
|
using var sut = FileSystemMainDomLock;
|
|
|
|
var result = await sut.AcquireLockAsync(1000);
|
|
|
|
Assert.False(result);
|
|
}
|
|
|
|
[Test]
|
|
[LongRunning]
|
|
public async Task ListenAsync_WhenLockReleaseSignalFileFound_DropsLockFileHandle()
|
|
{
|
|
using var sut = FileSystemMainDomLock;
|
|
|
|
await sut.AcquireLockAsync(1000);
|
|
|
|
var before = await sut.AcquireLockAsync(1000);
|
|
|
|
sut.CreateLockReleaseSignalFile();
|
|
await sut.ListenAsync();
|
|
|
|
var after = await sut.AcquireLockAsync(1000);
|
|
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.False(before);
|
|
Assert.True(after);
|
|
});
|
|
}
|
|
}
|