Skip to content

Commit 54aba4c

Browse files
elgatovjimevans
authored andcommitted
[dotnet] SlowLoadableComponent ignores UnableToLoadMessage
Fixes issue #8550
1 parent d3b35ef commit 54aba4c

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

dotnet/src/support/UI/SlowLoadableComponent{T}.cs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// <copyright file="SlowLoadableComponent{T}.cs" company="WebDriver Committers">
1+
// <copyright file="SlowLoadableComponent{T}.cs" company="WebDriver Committers">
22
// Licensed to the Software Freedom Conservancy (SFC) under one
33
// or more contributor license agreements. See the NOTICE file
44
// distributed with this work for additional information
@@ -104,8 +104,12 @@ public override T Load()
104104
}
105105
else
106106
{
107-
string timeoutMessage = string.Format(CultureInfo.InvariantCulture, "Timed out after {0} seconds.", this.timeout.TotalSeconds);
108-
throw new WebDriverTimeoutException(timeoutMessage);
107+
if (string.IsNullOrEmpty(UnableToLoadMessage))
108+
{
109+
this.UnableToLoadMessage = string.Format(CultureInfo.InvariantCulture, "Timed out after {0} seconds.", this.timeout.TotalSeconds);
110+
}
111+
112+
throw new WebDriverTimeoutException(this.UnableToLoadMessage);
109113
}
110114
}
111115

dotnet/src/webdriver/Firefox/FirefoxAndroidOptions.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ namespace OpenQA.Selenium.Firefox
2727
/// </summary>
2828
public class FirefoxAndroidOptions : AndroidOptions
2929
{
30-
private string androidPackage;
31-
private string androidDeviceSerial;
32-
private string androidActivity;
3330
private List<string> androidIntentArguments = new List<string>();
3431

3532
/// <summary>
@@ -54,7 +51,7 @@ public ReadOnlyCollection<string> AndroidIntentArguments
5451
/// <param name="arguments">The argument to add.</param>
5552
public void AddIntentArgument(string argument)
5653
{
57-
this.AddIntentArguments(argument);
54+
this.ddIntentArguments(argument);
5855
}
5956

6057
/// <summary>

0 commit comments

Comments
 (0)