Fix issue when service is shared and browser is not installed

nvborisenko · nvborisenko · commit 8ea2b306244c · 2025-01-11T21:27:54.000+03:00
diff --git a/dotnet/src/webdriver/Chromium/ChromiumDriver.cs b/dotnet/src/webdriver/Chromium/ChromiumDriver.cs
@@ -148,12 +148,13 @@ protected static IReadOnlyDictionary<string, CommandInfo> ChromiumCustomCommands
 
         private static ICommandExecutor StartDriverServiceCommandExecutor(DriverService service, DriverOptions options, TimeSpan commandTimeout)
         {
-            if (service.DriverServicePath == null)
+            if (service.DriverServicePath == null || string.IsNullOrEmpty(options.BinaryLocation))
             {
                 DriverFinder finder = new DriverFinder(options);
                 string fullServicePath = finder.GetDriverPath();
                 service.DriverServicePath = Path.GetDirectoryName(fullServicePath);
                 service.DriverServiceExecutableName = Path.GetFileName(fullServicePath);
+
                 if (finder.HasBrowserPath())
                 {
                     options.BinaryLocation = finder.GetBrowserPath();
diff --git a/dotnet/src/webdriver/Firefox/FirefoxDriver.cs b/dotnet/src/webdriver/Firefox/FirefoxDriver.cs
@@ -214,12 +214,13 @@ private FirefoxDriver(FirefoxDriverService service, bool disposeService, Firefox
         /// <returns></returns>
         private static ICommandExecutor StartDriverServiceCommandExecutor(DriverService service, DriverOptions options, TimeSpan commandTimeout)
         {
-            if (service.DriverServicePath == null)
+            if (service.DriverServicePath == null || string.IsNullOrEmpty(options.BinaryLocation))
             {
                 DriverFinder finder = new DriverFinder(options);
                 string fullServicePath = finder.GetDriverPath();
                 service.DriverServicePath = Path.GetDirectoryName(fullServicePath);
                 service.DriverServiceExecutableName = Path.GetFileName(fullServicePath);
+
                 if (finder.HasBrowserPath())
                 {
                     options.BinaryLocation = finder.GetBrowserPath();

Original file line number	Diff line number	Diff line change
`@@ -148,12 +148,13 @@ protected static IReadOnlyDictionary<string, CommandInfo> ChromiumCustomCommands`
`148`	`148`
`149`	`149`	`private static ICommandExecutor StartDriverServiceCommandExecutor(DriverService service, DriverOptions options, TimeSpan commandTimeout)`
`150`	`150`	`{`
`151`		`- if (service.DriverServicePath == null)`
	`151`	`+ if (service.DriverServicePath == null \|\| string.IsNullOrEmpty(options.BinaryLocation))`
`152`	`152`	`{`
`153`	`153`	`DriverFinder finder = new DriverFinder(options);`
`154`	`154`	`string fullServicePath = finder.GetDriverPath();`
`155`	`155`	`service.DriverServicePath = Path.GetDirectoryName(fullServicePath);`
`156`	`156`	`service.DriverServiceExecutableName = Path.GetFileName(fullServicePath);`
	`157`	`+`
`157`	`158`	`if (finder.HasBrowserPath())`
`158`	`159`	`{`
`159`	`160`	`options.BinaryLocation = finder.GetBrowserPath();`
Original file line number	Diff line number	Diff line change
`@@ -214,12 +214,13 @@ private FirefoxDriver(FirefoxDriverService service, bool disposeService, Firefox`
`214`	`214`	`/// <returns></returns>`
`215`	`215`	`private static ICommandExecutor StartDriverServiceCommandExecutor(DriverService service, DriverOptions options, TimeSpan commandTimeout)`
`216`	`216`	`{`
`217`		`- if (service.DriverServicePath == null)`
	`217`	`+ if (service.DriverServicePath == null \|\| string.IsNullOrEmpty(options.BinaryLocation))`
`218`	`218`	`{`
`219`	`219`	`DriverFinder finder = new DriverFinder(options);`
`220`	`220`	`string fullServicePath = finder.GetDriverPath();`
`221`	`221`	`service.DriverServicePath = Path.GetDirectoryName(fullServicePath);`
`222`	`222`	`service.DriverServiceExecutableName = Path.GetFileName(fullServicePath);`
	`223`	`+`
`223`	`224`	`if (finder.HasBrowserPath())`
`224`	`225`	`{`
`225`	`226`	`options.BinaryLocation = finder.GetBrowserPath();`