-
Notifications
You must be signed in to change notification settings - Fork 152
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.
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
Fixing SocketException caused by --explore #223
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 22 additions & 0 deletions
22
src/NUnitEngine/mock-assembly/AccessesCurrentTestContextDuringDiscovery.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| using NUnit.Framework; | ||
|
|
||
| namespace NUnit.Tests | ||
| { | ||
| public class AccessesCurrentTestContextDuringDiscovery | ||
| { | ||
| public const int Tests = 2; | ||
| public const int Suites = 1; | ||
|
|
||
| public static int[] TestCases() | ||
| { | ||
| var _ = TestContext.CurrentContext; | ||
| return new[] { 0 }; | ||
| } | ||
|
|
||
| [TestCaseSource(nameof(TestCases))] | ||
| public void Access_by_TestCaseSource(int arg) { } | ||
|
|
||
| [Test] | ||
| public void Access_by_ValueSource([ValueSource(nameof(TestCases))] int arg) { } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
116 changes: 116 additions & 0 deletions
116
src/NUnitEngine/nunit.engine.tests/Helpers/ProcessUtils.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Diagnostics; | ||
| using System.Text; | ||
|
|
||
| namespace NUnit.Engine.Tests.Helpers | ||
| { | ||
| public static class ProcessUtils | ||
| { | ||
| public static ProcessResult Run(ProcessStartInfo startInfo) | ||
| { | ||
| startInfo.UseShellExecute = false; | ||
| startInfo.RedirectStandardOutput = true; | ||
| startInfo.RedirectStandardError = true; | ||
| startInfo.CreateNoWindow = true; | ||
|
|
||
| using (var process = new Process { StartInfo = startInfo }) | ||
| { | ||
| var standardStreamData = new List<StandardStreamData>(); | ||
| var currentData = new StringBuilder(); | ||
| var currentDataIsError = false; | ||
|
|
||
| process.OutputDataReceived += (sender, e) => | ||
| { | ||
| if (e.Data == null) return; | ||
| if (currentDataIsError) | ||
| { | ||
| if (currentData.Length != 0) | ||
| standardStreamData.Add(new StandardStreamData(currentDataIsError, currentData.ToString())); | ||
| currentData = new StringBuilder(); | ||
| currentDataIsError = false; | ||
| } | ||
| currentData.AppendLine(e.Data); | ||
| }; | ||
| process.ErrorDataReceived += (sender, e) => | ||
| { | ||
| if (e.Data == null) return; | ||
| if (!currentDataIsError) | ||
| { | ||
| if (currentData.Length != 0) | ||
| standardStreamData.Add(new StandardStreamData(currentDataIsError, currentData.ToString())); | ||
| currentData = new StringBuilder(); | ||
| currentDataIsError = true; | ||
| } | ||
| currentData.AppendLine(e.Data); | ||
| }; | ||
|
|
||
| process.Start(); | ||
| process.BeginOutputReadLine(); | ||
| process.BeginErrorReadLine(); | ||
| process.WaitForExit(); | ||
|
|
||
| if (currentData.Length != 0) | ||
| standardStreamData.Add(new StandardStreamData(currentDataIsError, currentData.ToString())); | ||
|
|
||
| return new ProcessResult(process.ExitCode, standardStreamData.ToArray()); | ||
| } | ||
| } | ||
|
|
||
| [DebuggerDisplay("{ToString(),nq}")] | ||
| public struct ProcessResult | ||
| { | ||
| public ProcessResult(int exitCode, StandardStreamData[] standardStreamData) | ||
| { | ||
| ExitCode = exitCode; | ||
| StandardStreamData = standardStreamData; | ||
| } | ||
|
|
||
| public int ExitCode { get; } | ||
| public StandardStreamData[] StandardStreamData { get; } | ||
|
|
||
| public override string ToString() => ToString(true); | ||
|
|
||
| /// <param name="showStreamSource">If true, appends "[stdout] " or "[stderr] " to the beginning of each line.</param> | ||
| public string ToString(bool showStreamSource) | ||
| { | ||
| var r = new StringBuilder("Exit code ").Append(ExitCode); | ||
|
|
||
| if (StandardStreamData.Length != 0) r.AppendLine(); | ||
|
|
||
| foreach (var data in StandardStreamData) | ||
| { | ||
| if (showStreamSource) | ||
| { | ||
| var lines = data.Data.Split(new[] { Environment.NewLine }, StringSplitOptions.None); | ||
|
|
||
| // StandardStreamData.Data always ends with a blank line, so skip that | ||
| for (var i = 0; i < lines.Length - 1; i++) | ||
| r.Append(data.IsError ? "[stderr] " : "[stdout] ").AppendLine(lines[i]); | ||
| } | ||
| else | ||
| { | ||
| r.Append(data.Data); | ||
| } | ||
| } | ||
|
|
||
| return r.ToString(); | ||
| } | ||
| } | ||
|
|
||
| [DebuggerDisplay("{ToString(),nq}")] | ||
| public struct StandardStreamData | ||
| { | ||
| public StandardStreamData(bool isError, string data) | ||
| { | ||
| IsError = isError; | ||
| Data = data; | ||
| } | ||
|
|
||
| public bool IsError { get; } | ||
| public string Data { get; } | ||
|
|
||
| public override string ToString() => (IsError ? "[stderr] " : "[stdout] ") + Data; | ||
| } | ||
| } | ||
| } |
36 changes: 36 additions & 0 deletions
36
src/NUnitEngine/nunit.engine.tests/Helpers/ShadowCopyUtils.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.IO; | ||
| using System.Linq; | ||
| using System.Reflection; | ||
|
|
||
| namespace NUnit.Engine.Tests.Helpers | ||
| { | ||
| public static class ShadowCopyUtils | ||
| { | ||
| /// <summary> | ||
| /// Returns the transitive closure of assemblies needed to copy. | ||
| /// Deals with assembly names rather than paths to work with runners that shadow copy. | ||
| /// </summary> | ||
| public static ICollection<string> GetAllNeededAssemblyPaths(params string[] assemblyNames) | ||
| { | ||
| var r = new HashSet<string>(StringComparer.OrdinalIgnoreCase); | ||
|
|
||
| var dependencies = StackEnumerator.Create( | ||
| from assemblyName in assemblyNames | ||
| select new AssemblyName(assemblyName)); | ||
|
|
||
| foreach (var dependencyName in dependencies) | ||
| { | ||
| var dependency = Assembly.ReflectionOnlyLoad(dependencyName.FullName); | ||
|
|
||
| if (!dependency.GlobalAssemblyCache && r.Add(Path.GetFullPath(dependency.Location))) | ||
| { | ||
| dependencies.Recurse(dependency.GetReferencedAssemblies()); | ||
| } | ||
| } | ||
|
|
||
| return r; | ||
| } | ||
| } | ||
| } |
76 changes: 76 additions & 0 deletions
76
src/NUnitEngine/nunit.engine.tests/Helpers/StackEnumerator.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.ComponentModel; | ||
| using System.Linq; | ||
|
|
||
| namespace NUnit.Engine.Tests.Helpers | ||
| { | ||
| public static class StackEnumerator | ||
| { | ||
| public static StackEnumerator<T> Create<T>(params T[] initial) => new StackEnumerator<T>(initial); | ||
| public static StackEnumerator<T> Create<T>(IEnumerable<T> initial) => new StackEnumerator<T>(initial); | ||
| public static StackEnumerator<T> Create<T>(IEnumerator<T> initial) => new StackEnumerator<T>(initial); | ||
| } | ||
|
|
||
| public sealed class StackEnumerator<T> : IDisposable | ||
| { | ||
| private readonly Stack<IEnumerator<T>> stack = new Stack<IEnumerator<T>>(); | ||
| private IEnumerator<T> current; | ||
|
|
||
| public bool MoveNext() | ||
| { | ||
| while (!current.MoveNext()) | ||
| { | ||
| current.Dispose(); | ||
| if (stack.Count == 0) return false; | ||
| current = stack.Pop(); | ||
| } | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| public T Current => current.Current; | ||
|
|
||
| public void Recurse(IEnumerator<T> newCurrent) | ||
| { | ||
| if (newCurrent == null) return; | ||
| stack.Push(current); | ||
| current = newCurrent; | ||
| } | ||
| public void Recurse(IEnumerable<T> newCurrent) | ||
| { | ||
| if (newCurrent == null) return; | ||
| Recurse(newCurrent.GetEnumerator()); | ||
| } | ||
| public void Recurse(params T[] newCurrent) | ||
| { | ||
| Recurse((IEnumerable<T>)newCurrent); | ||
| } | ||
|
|
||
| public StackEnumerator(IEnumerator<T> initial) | ||
| { | ||
| current = initial ?? Enumerable.Empty<T>().GetEnumerator(); | ||
| } | ||
| public StackEnumerator(IEnumerable<T> initial) : this(initial?.GetEnumerator()) | ||
| { | ||
| } | ||
| public StackEnumerator(params T[] initial) : this((IEnumerable<T>)initial) | ||
| { | ||
| } | ||
|
|
||
| // Foreach support | ||
| [EditorBrowsable(EditorBrowsableState.Never)] | ||
| public StackEnumerator<T> GetEnumerator() | ||
| { | ||
| return this; | ||
| } | ||
|
|
||
| public void Dispose() | ||
| { | ||
| current.Dispose(); | ||
| foreach (var item in stack) | ||
| item.Dispose(); | ||
| stack.Clear(); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We have been starting two separate channels for no good reason which caused no small amount of confusion when prototyping the fix at 1 am last night. =D