Browse Source

Increase timeout for tests.

pull/581/head
Sebastian 5 years ago
parent
commit
70872f72bf
  1. 10
      backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/JintScriptEngine.cs
  2. 2
      backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/Scripting/JintScriptEngineHelperTests.cs
  3. 3
      backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/Scripting/JintScriptEngineTests.cs
  4. 2
      backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Counter/CounterJintExtensionTests.cs

10
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<IJintExtension>? 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<IJsonValue>();
@ -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<NamedContentData>();
@ -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)

2
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)
};
}

3
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)
};
}

2
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)
};
}

Loading…
Cancel
Save