open-source-mirrors
/
Lidarr
mirror of https://github.com/Lidarr/Lidarr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed: several failing/flaky mono unit tests

Browse Source 
Co-Authored-By: taloth <taloth@users.noreply.github.com>
pull/977/head
Qstick 5 years ago
parent 9711a0cc9c
commit 7ffecf6c50
8 changed files with 61 additions and 76 deletions
Show Stats Download Patch File Download Diff File

34
src/NzbDrone.Common.Test/DiskTests/FreeSpaceFixtureBase.cs
Unescape View File

@ -25,13 +25,6 @@ namespace NzbDrone.Common.Test.DiskTests
Subject.GetAvailableSpace(Path.Combine(path, "invalidFolder")).Should().NotBe(0);
}
[Test]
public void should_be_able_to_check_space_on_ramdrive()
{
MonoOnly();
Subject.GetAvailableSpace("/run/").Should().NotBe(0);
}
[Test]
public void should_return_free_disk_space()
{
@ -39,33 +32,6 @@ namespace NzbDrone.Common.Test.DiskTests
result.Should().BeGreaterThan(0);
}
[Test]
public void should_be_able_to_get_space_on_unc()
{
WindowsOnly();
var result = Subject.GetAvailableSpace(@"\\localhost\c$\Windows");
result.Should().BeGreaterThan(0);
}
[Test]
public void should_throw_if_drive_doesnt_exist()
{
WindowsOnly();
// Find a drive that doesn't exist.
for (char driveletter = 'Z'; driveletter > 'D' ; driveletter--)
{
if (new DriveInfo(driveletter.ToString()).IsReady)
continue;
Assert.Throws<DirectoryNotFoundException>(() => Subject.GetAvailableSpace(driveletter + @":\NOT_A_REAL_PATH\DOES_NOT_EXIST".AsOsAgnostic()));
return;
}
Assert.Inconclusive("No drive available for testing.");
}
[Test]
public void should_be_able_to_get_space_on_folder_that_doesnt_exist()
{

33
src/NzbDrone.Common.Test/ProcessProviderFixture.cs
Unescape View File

@ -16,6 +16,7 @@ namespace NzbDrone.Common.Test
// We don't want one tests setup killing processes used in another
[NonParallelizable]
[TestFixture]
[Platform(Exclude = "MacOsX")]
public class ProcessProviderFixture : TestBase<ProcessProvider>
{
@ -71,20 +72,18 @@ namespace NzbDrone.Common.Test
{
var process = StartDummyProcess();
var check = Subject.GetProcessById(process.Id);
check.Should().NotBeNull();
Thread.Sleep(500);
process.Refresh();
process.HasExited.Should().BeFalse();
Subject.Exists(DummyApp.DUMMY_PROCCESS_NAME).Should()
.BeTrue("one running dummy process");
process.Kill();
process.WaitForExit();
process.HasExited.Should().BeTrue();
Subject.Exists(DummyApp.DUMMY_PROCCESS_NAME).Should().BeFalse();
}
[Test]
[Platform(Exclude="MacOsX")]
[Retry(3)]
public void exists_should_find_running_process()
{
var process = StartDummyProcess();
@ -100,12 +99,13 @@ namespace NzbDrone.Common.Test
[Test]
[Platform(Exclude="MacOsX")]
public void kill_all_should_kill_all_process_with_name()
{
var dummy1 = StartDummyProcess();
var dummy2 = StartDummyProcess();
Thread.Sleep(500);
Subject.KillAll(DummyApp.DUMMY_PROCCESS_NAME);
dummy1.HasExited.Should().BeTrue();
@ -114,26 +114,11 @@ namespace NzbDrone.Common.Test
private Process StartDummyProcess()
{
var processStarted = new ManualResetEventSlim();
var path = Path.Combine(TestContext.CurrentContext.TestDirectory, DummyApp.DUMMY_PROCCESS_NAME + ".exe");
var process = Subject.Start(path, onOutputDataReceived: (string data) => {
if (data.StartsWith("Dummy process. ID:"))
{
processStarted.Set();
}
});
if (!processStarted.Wait(2000))
{
Assert.Fail("Failed to start process within 2 sec");
}
return process;
return Subject.Start(path);
}
[Test]
[Retry(3)]
public void ToString_on_new_processInfo()
{
Console.WriteLine(new ProcessInfo().ToString());

1
src/NzbDrone.Common/Composition/Container.cs
Unescape View File

@ -54,7 +54,6 @@ namespace NzbDrone.Common.Composition
var factory = CreateSingletonImplementationFactory(implementation);
_container.Register(service, factory);
_container.Register(service, factory, implementation.FullName);
}
public IEnumerable<T> ResolveAll<T>() where T : class

8
src/NzbDrone.Core.Test/Messaging/Commands/CommandExecutorFixture.cs
Unescape View File

@ -71,9 +71,9 @@ namespace NzbDrone.Core.Test.Messaging.Commands
_commandQueue.Add(commandModel);
if (!waitEventComplete.Wait(2000))
if (!waitEventComplete.Wait(15000))
{
Assert.Fail("Command did not Complete/Fail within 2 sec");
Assert.Fail("Command did not Complete/Fail within 15 sec");
}
if (waitPublish && !waitEventPublish.Wait(500))
@ -141,7 +141,7 @@ namespace NzbDrone.Core.Test.Messaging.Commands
Subject.Handle(new ApplicationStartedEvent());
QueueAndWaitForExecution(commandModel);
QueueAndWaitForExecution(commandModel, true);
VerifyEventPublished<CommandExecutedEvent>();
@ -160,7 +160,7 @@ namespace NzbDrone.Core.Test.Messaging.Commands
Subject.Handle(new ApplicationStartedEvent());
QueueAndWaitForExecution(commandModel);
QueueAndWaitForExecution(commandModel, true);
VerifyEventPublished<CommandExecutedEvent>();
}

14
src/NzbDrone.Host.Test/ContainerFixture.cs
Unescape View File

@ -65,19 +65,19 @@ namespace NzbDrone.App.Test
}
[Test]
public void should_return_same_instance_of_singletons()
public void should_return_same_instance_via_resolve_and_resolveall()
{
var first = _container.ResolveAll<IHandle<ApplicationShutdownRequested>>().OfType<Scheduler>().Single();
var second = _container.ResolveAll<IHandle<ApplicationShutdownRequested>>().OfType<Scheduler>().Single();
var first = (DownloadMonitoringService)_container.Resolve<IHandle<TrackedDownloadsRemovedEvent>>();
var second = _container.ResolveAll<IHandle<TrackedDownloadsRemovedEvent>>().OfType<DownloadMonitoringService>().Single();
first.Should().BeSameAs(second);
}
[Test]
public void should_return_same_instance_of_singletons_by_different_same_interface()
public void should_return_same_instance_of_singletons_by_same_interface()
{
var first = _container.ResolveAll<IHandle<AlbumGrabbedEvent>>().OfType<DownloadMonitoringService>().Single();
var second = _container.ResolveAll<IHandle<AlbumGrabbedEvent>>().OfType<DownloadMonitoringService>().Single();
var first = _container.ResolveAll<IHandle<TrackedDownloadsRemovedEvent>>().OfType<DownloadMonitoringService>().Single();
var second = _container.ResolveAll<IHandle<TrackedDownloadsRemovedEvent>>().OfType<DownloadMonitoringService>().Single();
first.Should().BeSameAs(second);
}
@ -85,7 +85,7 @@ namespace NzbDrone.App.Test
[Test]
public void should_return_same_instance_of_singletons_by_different_interfaces()
{
var first = _container.ResolveAll<IHandle<AlbumGrabbedEvent>>().OfType<DownloadMonitoringService>().Single();
var first = _container.ResolveAll<IHandle<TrackedDownloadsRemovedEvent>>().OfType<DownloadMonitoringService>().Single();
var second = (DownloadMonitoringService)_container.Resolve<IExecute<CheckForFinishedDownloadCommand>>();
first.Should().BeSameAs(second);

18
src/NzbDrone.Mono.Test/DiskProviderTests/FreeSpaceFixture.cs
Unescape View File

@ -1,4 +1,6 @@
using System.Collections.Generic;
using System.IO;
using FluentAssertions;
using Moq;
using NUnit.Framework;
using NzbDrone.Common.Disk;
@ -11,16 +13,24 @@ namespace NzbDrone.Mono.Test.DiskProviderTests
[Platform("Mono")]
public class FreeSpaceFixture : FreeSpaceFixtureBase<DiskProvider>
{
public FreeSpaceFixture()
{
MonoOnly();
}
[SetUp]
public void Setup()
{
Mocker.SetConstant<ISymbolicLinkResolver>(Mocker.Resolve<SymbolicLinkResolver>());
Mocker.SetConstant<IProcMountProvider>(Mocker.Resolve<ProcMountProvider>());
Mocker.SetConstant<IProcMountProvider>(new ProcMountProvider(TestLogger));
Mocker.GetMock<ISymbolicLinkResolver>()
.Setup(v => v.GetCompleteRealPath(It.IsAny<string>()))
.Returns<string>(s => s);
}
public FreeSpaceFixture()
[Test]
public void should_be_able_to_check_space_on_ramdrive()
{
MonoOnly();
Subject.GetAvailableSpace("/run/").Should().NotBe(0);
}
}
}

2
src/NzbDrone.Test.Common/LoggingTest.cs
Unescape View File

@ -44,7 +44,7 @@ namespace NzbDrone.Test.Common
private static void RegisterConsoleLogger()
{
var consoleTarget = new ConsoleTarget { Layout = "${level}: ${message} ${exception}" };
var consoleTarget = new ConsoleTarget { Layout = "${date:format=HH\\:mm\\:ss.f} ${level}: ${message} ${exception}" };
LogManager.Configuration.AddTarget(consoleTarget.GetType().Name, consoleTarget);
LogManager.Configuration.LoggingRules.Add(new LoggingRule("*", LogLevel.Trace, consoleTarget));
}

27
src/NzbDrone.Windows.Test/DiskProviderTests/FreeSpaceFixture.cs
Unescape View File

@ -1,4 +1,6 @@
using NUnit.Framework;
using System.IO;
using FluentAssertions;
using NUnit.Framework;
using NzbDrone.Common.Test.DiskTests;
using NzbDrone.Windows.Disk;
@ -12,5 +14,28 @@ namespace NzbDrone.Windows.Test.DiskProviderTests
{
WindowsOnly();
}
[Test]
public void should_throw_if_drive_doesnt_exist()
{
// Find a drive that doesn't exist.
for (char driveletter = 'Z'; driveletter > 'D'; driveletter--)
{
if (new DriveInfo(driveletter.ToString()).IsReady)
continue;
Assert.Throws<DirectoryNotFoundException>(() => Subject.GetAvailableSpace(driveletter + @":\NOT_A_REAL_PATH\DOES_NOT_EXIST"));
return;
}
Assert.Inconclusive("No drive available for testing.");
}
[Test]
public void should_be_able_to_get_space_on_unc()
{
var result = Subject.GetAvailableSpace(@"\\localhost\c$\Windows");
result.Should().BeGreaterThan(0);
}
}
}

Write Preview
Loading…
Cancel
Save