From 70872f72bf5bb31d68a46a529dd3f501d60bcf3e Mon Sep 17 00:00:00 2001 From: Sebastian Date: Thu, 24 Sep 2020 16:22:13 +0200 Subject: [PATCH] Increase timeout for tests. --- .../Scripting/JintScriptEngine.cs | 10 +++++----- .../Scripting/JintScriptEngineHelperTests.cs | 2 +- .../Operations/Scripting/JintScriptEngineTests.cs | 3 ++- .../Contents/Counter/CounterJintExtensionTests.cs | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/JintScriptEngine.cs b/backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/JintScriptEngine.cs index fe8a91e57..71f4c31b2 100644 --- a/backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/JintScriptEngine.cs +++ b/backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/JintScriptEngine.cs @@ -30,9 +30,9 @@ namespace Squidex.Domain.Apps.Core.Scripting private readonly IJintExtension[] extensions; private readonly Parser parser; - public TimeSpan Timeout { get; set; } = TimeSpan.FromMilliseconds(200); + public TimeSpan TimeoutScript { get; set; } = TimeSpan.FromMilliseconds(200); - public TimeSpan ExecutionTimeout { get; set; } = TimeSpan.FromMilliseconds(4000); + public TimeSpan TimeoutExecution { get; set; } = TimeSpan.FromMilliseconds(4000); public JintScriptEngine(IMemoryCache memoryCache, IEnumerable? extensions = null) { @@ -46,7 +46,7 @@ namespace Squidex.Domain.Apps.Core.Scripting Guard.NotNull(vars, nameof(vars)); Guard.NotNullOrEmpty(script, nameof(script)); - using (var cts = new CancellationTokenSource(ExecutionTimeout)) + using (var cts = new CancellationTokenSource(TimeoutExecution)) { var tcs = new TaskCompletionSource(); @@ -76,7 +76,7 @@ namespace Squidex.Domain.Apps.Core.Scripting Guard.NotNull(vars, nameof(vars)); Guard.NotNullOrEmpty(script, nameof(script)); - using (var cts = new CancellationTokenSource(ExecutionTimeout)) + using (var cts = new CancellationTokenSource(TimeoutExecution)) { var tcs = new TaskCompletionSource(); @@ -140,7 +140,7 @@ namespace Squidex.Domain.Apps.Core.Scripting options.AddObjectConverter(DefaultConverter.Instance); options.SetReferencesResolver(NullPropagation.Instance); options.Strict(); - options.TimeoutInterval(Timeout); + options.TimeoutInterval(TimeoutScript); }); if (options.CanDisallow) diff --git a/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/Scripting/JintScriptEngineHelperTests.cs b/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/Scripting/JintScriptEngineHelperTests.cs index 969165051..92bf2d231 100644 --- a/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/Scripting/JintScriptEngineHelperTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/Scripting/JintScriptEngineHelperTests.cs @@ -42,7 +42,7 @@ namespace Squidex.Domain.Apps.Core.Operations.Scripting sut = new JintScriptEngine(cache, extensions) { - Timeout = TimeSpan.FromSeconds(1) + TimeoutScript = TimeSpan.FromSeconds(1) }; } diff --git a/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/Scripting/JintScriptEngineTests.cs b/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/Scripting/JintScriptEngineTests.cs index 25267a819..70fd1f091 100644 --- a/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/Scripting/JintScriptEngineTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/Scripting/JintScriptEngineTests.cs @@ -58,7 +58,8 @@ namespace Squidex.Domain.Apps.Core.Operations.Scripting sut = new JintScriptEngine(cache, extensions) { - Timeout = TimeSpan.FromSeconds(1) + TimeoutScript = TimeSpan.FromSeconds(10), + TimeoutExecution = TimeSpan.FromSeconds(2) }; } diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Counter/CounterJintExtensionTests.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Counter/CounterJintExtensionTests.cs index 88b846d7d..1eaf145a2 100644 --- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Counter/CounterJintExtensionTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Counter/CounterJintExtensionTests.cs @@ -32,7 +32,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Counter sut = new JintScriptEngine(cache, extensions) { - Timeout = TimeSpan.FromSeconds(1) + TimeoutScript = TimeSpan.FromSeconds(1) }; }