Skip to content

[Harness] If we cannot connect over tcp use Console.Out as the writer. #8235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mandel-macaque merged 3 commits into from
Apr 1, 2020
Merged

[Harness] If we cannot connect over tcp use Console.Out as the writer. #8235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e9d7234
[Harness] If we cannot connect over tcp use Console.Out as the writer.
mandel-macaque Mar 30, 2020
1aa1645
Manuel is an imbecil and did not run test locally.
mandel-macaque Mar 30, 2020
cca2113
Merge branch 'master' into issue-8130
mandel-macaque Mar 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/xharness/TestImporter/Templates/Managed/Resources/src/iOSApp/ViewController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public async override void ViewDidLoad ()
break;
}
if (options.EnableXml) {
runner.WriteResultsToFile (writer, jargon);
runner.WriteResultsToFile (writer ?? Console.Out, jargon);
logger.Info ("Xml file was written to the tcp listener.");
} else {
string resultsFilePath = runner.WriteResultsToFile (jargon);
Expand Down
12 changes: 9 additions & 3 deletions tests/xharness/TestImporter/Templates/Managed/Resources/src/tvOSApp/ViewController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,14 @@ public async override void ViewDidLoad ()
base.ViewDidLoad ();
var options = ApplicationOptions.Current;
TcpTextWriter writer = null;
if (!string.IsNullOrEmpty (options.HostName))
writer = new TcpTextWriter (options.HostName, options.HostPort);
if (!string.IsNullOrEmpty (options.HostName)) {
try {
writer = new TcpTextWriter (options.HostName, options.HostPort);
} catch (Exception ex) {
Console.WriteLine ("Network error: Cannot connect to {0}:{1}: {2}. Continuing on console.", options.HostName, options.HostPort, ex);
writer = null; // will default to the console
}
}

// we generate the logs in two different ways depending if the generate xml flag was
// provided. If it was, we will write the xml file to the tcp writer if present, else
Expand Down Expand Up @@ -97,7 +103,7 @@ public async override void ViewDidLoad ()
break;
}
if (options.EnableXml) {
runner.WriteResultsToFile (writer, jargon);
runner.WriteResultsToFile (writer ?? Console.Out, jargon);
logger.Info ("Xml file was written to the tcp listener.");
} else {
string resultsFilePath = runner.WriteResultsToFile (jargon);
Expand Down