Skip to content
代码片段 群组 项目
提交 d84cce54 编辑于 作者: jacalvar's avatar jacalvar
浏览文件

Revert "Fix selenium-standalone invocation (#41592)"

This reverts commit 10a13462.
上级 52c11c30
No related tags found
无相关合并请求
...@@ -268,9 +268,9 @@ ...@@ -268,9 +268,9 @@
<MicrosoftPlaywrightVersion>1.17.3</MicrosoftPlaywrightVersion> <MicrosoftPlaywrightVersion>1.17.3</MicrosoftPlaywrightVersion>
<PollyExtensionsHttpVersion>3.0.0</PollyExtensionsHttpVersion> <PollyExtensionsHttpVersion>3.0.0</PollyExtensionsHttpVersion>
<PollyVersion>7.2.3</PollyVersion> <PollyVersion>7.2.3</PollyVersion>
<SeleniumSupportVersion>4.1.0</SeleniumSupportVersion> <SeleniumSupportVersion>4.1.1</SeleniumSupportVersion>
<SeleniumWebDriverChromeDriverVersion>98.0.4758.10200</SeleniumWebDriverChromeDriverVersion> <SeleniumWebDriverChromeDriverVersion>100.0.4896.6000</SeleniumWebDriverChromeDriverVersion>
<SeleniumWebDriverVersion>4.1.0</SeleniumWebDriverVersion> <SeleniumWebDriverVersion>4.1.1</SeleniumWebDriverVersion>
<SerilogExtensionsLoggingVersion>1.4.0</SerilogExtensionsLoggingVersion> <SerilogExtensionsLoggingVersion>1.4.0</SerilogExtensionsLoggingVersion>
<SerilogSinksFileVersion>4.0.0</SerilogSinksFileVersion> <SerilogSinksFileVersion>4.0.0</SerilogSinksFileVersion>
<StackExchangeRedisVersion>2.2.4</StackExchangeRedisVersion> <StackExchangeRedisVersion>2.2.4</StackExchangeRedisVersion>
......
...@@ -47,10 +47,12 @@ ...@@ -47,10 +47,12 @@
"src\\Components\\benchmarkapps\\Wasm.Performance\\TestApp\\Wasm.Performance.TestApp.csproj", "src\\Components\\benchmarkapps\\Wasm.Performance\\TestApp\\Wasm.Performance.TestApp.csproj",
"src\\Components\\test\\E2ETest\\Microsoft.AspNetCore.Components.E2ETests.csproj", "src\\Components\\test\\E2ETest\\Microsoft.AspNetCore.Components.E2ETests.csproj",
"src\\Components\\test\\testassets\\BasicTestApp\\BasicTestApp.csproj", "src\\Components\\test\\testassets\\BasicTestApp\\BasicTestApp.csproj",
"src\\Components\\test\\testassets\\ComponentsApp.App\\ComponentsApp.App.csproj",
"src\\Components\\test\\testassets\\ComponentsApp.Server\\ComponentsApp.Server.csproj", "src\\Components\\test\\testassets\\ComponentsApp.Server\\ComponentsApp.Server.csproj",
"src\\Components\\test\\testassets\\GlobalizationWasmApp\\GlobalizationWasmApp.csproj", "src\\Components\\test\\testassets\\GlobalizationWasmApp\\GlobalizationWasmApp.csproj",
"src\\Components\\test\\testassets\\LazyTestContentPackage\\LazyTestContentPackage.csproj",
"src\\Components\\test\\testassets\\TestContentPackage\\TestContentPackage.csproj", "src\\Components\\test\\testassets\\TestContentPackage\\TestContentPackage.csproj",
"src\\Components\\test\\testassets\\TestServer\\Components.TestServer.csproj" "src\\Components\\test\\testassets\\TestServer\\Components.TestServer.csproj"
] ]
} }
} }
\ No newline at end of file
此差异已折叠。
...@@ -178,7 +178,13 @@ public class SeleniumStandaloneServer : IDisposable ...@@ -178,7 +178,13 @@ public class SeleniumStandaloneServer : IDisposable
// Log // Log
void LogOutput(object sender, DataReceivedEventArgs e) void LogOutput(object sender, DataReceivedEventArgs e)
{ {
logOutput.TryAdd(e.Data); try
{
logOutput.TryAdd(e.Data);
}
catch (Exception)
{
}
// We avoid logging on the output here because it is unreliable. We can only log in the diagnostics sink. // We avoid logging on the output here because it is unreliable. We can only log in the diagnostics sink.
lock (_diagnosticsMessageSink) lock (_diagnosticsMessageSink)
......
...@@ -116,7 +116,7 @@ public static class WaitAssert ...@@ -116,7 +116,7 @@ public static class WaitAssert
// tests running concurrently might use the DefaultTimeout in their current assertion, which is fine. // tests running concurrently might use the DefaultTimeout in their current assertion, which is fine.
TestRunFailed = true; TestRunFailed = true;
var innerHtml = driver.FindElement(By.CssSelector(":first-child")).GetAttribute("innerHTML"); var innerHtml = driver.FindElement(By.CssSelector(":first-child"))?.GetAttribute("innerHTML");
var fileId = $"{Guid.NewGuid():N}.png"; var fileId = $"{Guid.NewGuid():N}.png";
var screenShotPath = Path.Combine(Path.GetFullPath(E2ETestOptions.Instance.ScreenShotsPath), fileId); var screenShotPath = Path.Combine(Path.GetFullPath(E2ETestOptions.Instance.ScreenShotsPath), fileId);
......
{ {
"drivers": { "drivers": {
"chrome": { "chrome": {
"version" : "99.0.4844.35" "version" : "100.0.4896.60"
} }
}, },
"ignoreExtraDrivers": true "ignoreExtraDrivers": true
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册