Skip to content

Commit a8984c2

Browse files
authored
[dotnet] [test] Parallelize internal testing (#18110)
1 parent 888a7a2 commit a8984c2

33 files changed

Lines changed: 193 additions & 156 deletions

‎dotnet/private/dotnet_nunit_test_suite.bzl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ _BROWSERS = {
8888
"ActiveDriverConfig=IE",
8989
],
9090
"data": [],
91-
"tags": [],
91+
"tags": ["exclusive-if-local"], # IE cannot run in parallel.
9292
"target_compatible_with": ["@platforms//os:windows"],
9393
},
9494
"safari": {
@@ -97,7 +97,7 @@ _BROWSERS = {
9797
"ActiveDriverConfig=Safari",
9898
],
9999
"data": [],
100-
"tags": [],
100+
"tags": ["exclusive-if-local"], # Safari cannot run in parallel.
101101
"target_compatible_with": ["@platforms//os:osx"],
102102
},
103103
"remote": {

‎dotnet/test/remote/AssemblyTeardown.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
using NUnit.Framework;
2121
using OpenQA.Selenium.Testing.NUnit;
2222

23+
[assembly: Parallelizable(ParallelScope.Fixtures)]
24+
[assembly: SingleSessionBrowser(Browser.Safari, Browser.IE)]
25+
2326
[SetUpFixture]
2427
#pragma warning disable // Outside a namespace to affect the entire assembly
2528
public class AssemblyTeardown : AssemblyFixtureBase

‎dotnet/test/remote/RemoteWebDriverSpecificTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public void Teardown()
5252
[NeedsFreshDriver(IsCreatedAfterTest = true)]
5353
public void ShouldBeAbleToCreateRemoteWebDriverWithNoSlashAtEndOfUri()
5454
{
55-
EnvironmentManager.Instance.CloseCurrentDriver();
55+
CloseDriver();
5656
DriverOptions options = OperatingSystem.IsWindows() ? new EdgeOptions() : new ChromeOptions();
5757
RemoteWebDriver noSlashDriver = new RemoteWebDriver(RemoteSeleniumServer.ServerUri, options);
5858
noSlashDriver.Url = Urls.JavascriptPage;

‎dotnet/test/support/AssemblyFixture.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
// under the License.
1818
// </copyright>
1919

20+
[assembly: Parallelizable(ParallelScope.Fixtures)]
21+
[assembly: SingleSessionBrowser(Browser.Safari, Browser.IE)]
22+
2023
namespace OpenQA.Selenium.Support.Tests;
2124

2225
[SetUpFixture]

‎dotnet/test/testing.nunit/AssemblyFixtureBase.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ public async Task RunBeforeAnyTestAsync()
4242
[OneTimeTearDown]
4343
public async Task RunAfterAnyTestsAsync()
4444
{
45-
EnvironmentManager.Instance.CloseCurrentDriver();
4645
await EnvironmentManager.Instance.WebServer.StopAsync();
4746
if (StartRemoteServer)
4847
{

‎dotnet/test/testing.nunit/DriverConfigs/DefaultSafariDriver.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace OpenQA.Selenium.Testing.NUnit.DriverConfigs;
2626
// constructor.
2727
public class DefaultSafariDriver : SafariDriver
2828
{
29-
// Required for dynamic setting with `EnvironmentManager.Instance.CreateDriverInstance(options)`
29+
// Required for dynamic setting with `DriverFactory.CreateDriver(options)`
3030
public DefaultSafariDriver(SafariOptions options)
3131
: base(options)
3232
{

‎dotnet/test/testing.nunit/DriverConfigs/DevChannelChromeDriver.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public DevChannelChromeDriver()
4848
{
4949
}
5050

51-
// Required for dynamic setting with `EnvironmentManager.Instance.CreateDriverInstance(options)`
51+
// Required for dynamic setting with `DriverFactory.CreateDriver(options)`
5252
public DevChannelChromeDriver(ChromeOptions options)
5353
: base(options)
5454
{

‎dotnet/test/testing.nunit/DriverConfigs/DevChannelEdgeDriver.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public DevChannelEdgeDriver()
2828
{
2929
}
3030

31-
// Required for dynamic setting with `EnvironmentManager.Instance.CreateDriverInstance(options)`
31+
// Required for dynamic setting with `DriverFactory.CreateDriver(options)`
3232
public DevChannelEdgeDriver(EdgeOptions options)
3333
: base(options)
3434
{

‎dotnet/test/testing.nunit/DriverConfigs/EdgeInternetExplorerModeDriver.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public EdgeInternetExplorerModeDriver()
3131
{
3232
}
3333

34-
// Required for dynamic setting with `EnvironmentManager.Instance.CreateDriverInstance(options)`
34+
// Required for dynamic setting with `DriverFactory.CreateDriver(options)`
3535
public EdgeInternetExplorerModeDriver(InternetExplorerOptions options)
3636
: base(options)
3737
{

‎dotnet/test/testing.nunit/DriverConfigs/NightlyChannelFirefoxDriver.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public NightlyChannelFirefoxDriver()
3131
{
3232
}
3333

34-
// Required for dynamic setting with `EnvironmentManager.Instance.CreateDriverInstance(options)`
34+
// Required for dynamic setting with `DriverFactory.CreateDriver(options)`
3535
public NightlyChannelFirefoxDriver(FirefoxOptions options)
3636
: base(options)
3737
{

0 commit comments

Comments
 (0)