cyanfish/naps2
1
1
Fork 0
mirror of https://github.com/cyanfish/naps2.git synced 2024-10-03 19:07:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Escl: Add timeouts to tests

Browse Source
This commit is contained in:
Ben Olden-Cooligan 2024-03-31 22:48:34 -07:00
parent 7c3b5556b1
commit 6456d1f1e7
6 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NAPS2.Escl.Tests/ClientServerTests.cs
View File

@ -8,7 +8,7 @@ namespace NAPS2.Escl.Tests;
public class ClientServerTests
{
[Fact]
[Fact(Timeout = 60_000)]
public async Task ClientServer()
{
var job = Substitute.For<IEsclScanJob>();

4
NAPS2.Sdk.Tests/Remoting/FallbackScanServerTests.cs
View File

@ -12,7 +12,7 @@ namespace NAPS2.Sdk.Tests.Remoting;
public class FallbackScanServerTests(ITestOutputHelper testOutputHelper) : ScanServerTestsBase(testOutputHelper,
EsclSecurityPolicy.None, new X509Certificate2(BinaryResources.testcert))
{
[Fact]
[Fact(Timeout = TIMEOUT)]
public async Task ScanFallbackFromHttpsToHttp()
{
_bridge.MockOutput = CreateScannedImages(ImageResources.dog);
@ -30,7 +30,7 @@ public class FallbackScanServerTests(ITestOutputHelper testOutputHelper) : ScanS
ImageAsserts.Similar(ImageResources.dog, images[0]);
}
[Fact]
[Fact(Timeout = TIMEOUT)]
public async Task ScanPreventedByTrustedCertificateSecurityPolicy()
{
var scanResult = _client.Scan(new ScanOptions

16
NAPS2.Sdk.Tests/Remoting/ScanServerTests.cs
View File

@ -11,13 +11,13 @@ namespace NAPS2.Sdk.Tests.Remoting;
public class ScanServerTests(ITestOutputHelper testOutputHelper)
: ScanServerTestsBase(testOutputHelper, EsclSecurityPolicy.ServerDisableHttps)
{
[Fact]
[Fact(Timeout = TIMEOUT)]
public async Task FindDevice()
{
Assert.True(await TryFindClientDevice());
}
[Fact]
[Fact(Timeout = TIMEOUT)]
public async Task Scan()
{
_bridge.MockOutput = CreateScannedImages(ImageResources.dog);
@ -29,7 +29,7 @@ public class ScanServerTests(ITestOutputHelper testOutputHelper)
ImageAsserts.Similar(ImageResources.dog, images[0]);
}
[Fact]
[Fact(Timeout = TIMEOUT)]
public async Task ScanMultiplePages()
{
_bridge.MockOutput =
@ -45,7 +45,7 @@ public class ScanServerTests(ITestOutputHelper testOutputHelper)
ImageAsserts.Similar(ImageResources.dog_h_p300, images[2]);
}
[Fact]
[Fact(Timeout = TIMEOUT)]
public async Task ScanWithCorrectOptions()
{
_bridge.MockOutput = CreateScannedImages(ImageResources.dog);
@ -118,7 +118,7 @@ public class ScanServerTests(ITestOutputHelper testOutputHelper)
ImageAsserts.Similar(ImageResources.dog_bw, images[0]);
}
[Fact]
[Fact(Timeout = TIMEOUT)]
public async Task ScanWithError()
{
_bridge.Error = new DeviceFeederEmptyException();
@ -130,7 +130,7 @@ public class ScanServerTests(ITestOutputHelper testOutputHelper)
}).ToListAsync());
}
[Fact]
[Fact(Timeout = TIMEOUT)]
public async Task ScanWithErrorAfterPage()
{
_bridge.MockOutput = CreateScannedImages(ImageResources.dog);
@ -149,7 +149,7 @@ public class ScanServerTests(ITestOutputHelper testOutputHelper)
Assert.Equal(SdkResources.DevicePaperJam, exception.Message);
}
[Fact(Skip = "Flaky")]
[Fact(Timeout = TIMEOUT, Skip = "Flaky")]
public async Task ScanProgress()
{
_bridge.MockOutput = CreateScannedImages(ImageResources.dog, ImageResources.dog);
@ -175,7 +175,7 @@ public class ScanServerTests(ITestOutputHelper testOutputHelper)
Arg.Is<PageProgressEventArgs>(args => args.PageNumber == 2 && args.Progress == 0.5));
}
[Fact]
[Fact(Timeout = TIMEOUT)]
public async Task ScanPreventedByHttpsSecurityPolicy()
{
var scanResult = _client.Scan(new ScanOptions

2
NAPS2.Sdk.Tests/Remoting/ScanServerTestsBase.cs
View File

@ -14,6 +14,8 @@ namespace NAPS2.Sdk.Tests.Remoting;
public class ScanServerTestsBase : ContextualTests
{
protected const int TIMEOUT = 60_000;
protected readonly ScanServer _server;
private protected readonly MockScanBridge _bridge;
protected readonly ScanController _client;

6
NAPS2.Sdk.Tests/Remoting/SelfSignedCertScanServerTests.cs
View File

@ -11,13 +11,13 @@ namespace NAPS2.Sdk.Tests.Remoting;
public class SelfSignedCertScanServerTests(ITestOutputHelper testOutputHelper)
: ScanServerTestsBase(testOutputHelper, EsclSecurityPolicy.RequireHttps)
{
[Fact]
[Fact(Timeout = TIMEOUT)]
public async Task FindDevice()
{
Assert.True(await TryFindClientDevice());
}
[Fact]
[Fact(Timeout = TIMEOUT)]
public async Task Scan()
{
_bridge.MockOutput = CreateScannedImages(ImageResources.dog);
@ -33,7 +33,7 @@ public class SelfSignedCertScanServerTests(ITestOutputHelper testOutputHelper)
ImageAsserts.Similar(ImageResources.dog, images[0]);
}
[Fact]
[Fact(Timeout = TIMEOUT)]
public async Task ScanPreventedByTrustedCertificateSecurityPolicy()
{
var scanResult = _client.Scan(new ScanOptions

6
NAPS2.Sdk.Tests/Remoting/TlsScanServerTests.cs
View File

@ -12,13 +12,13 @@ namespace NAPS2.Sdk.Tests.Remoting;
public class TlsScanServerTests(ITestOutputHelper testOutputHelper) : ScanServerTestsBase(testOutputHelper,
EsclSecurityPolicy.RequireHttps, new X509Certificate2(BinaryResources.testcert))
{
[Fact]
[Fact(Timeout = TIMEOUT)]
public async Task FindDevice()
{
Assert.True(await TryFindClientDevice());
}
[Fact]
[Fact(Timeout = TIMEOUT)]
public async Task Scan()
{
_bridge.MockOutput = CreateScannedImages(ImageResources.dog);
@ -34,7 +34,7 @@ public class TlsScanServerTests(ITestOutputHelper testOutputHelper) : ScanServer
ImageAsserts.Similar(ImageResources.dog, images[0]);
}
[Fact]
[Fact(Timeout = TIMEOUT)]
public async Task ScanPreventedByTrustedCertificateSecurityPolicy()
{
var scanResult = _client.Scan(new ScanOptions