Skip to content

Commit 410066f

Browse files
[MNTR] fix test dll loading error (#5044)
* Fix assembly loading * Fix regex for passing test * Try to start a full build * Regex \w includes underscore * Revert back regex to \w * Update NotUsed.cs Co-authored-by: Aaron Stannard <[email protected]>
1 parent c663bc2 commit 410066f

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

src/core/Akka.MultiNodeTestRunner.Shared/Sinks/MessageSink.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public enum MultiNodeTestRunnerMessageType
8989
};
9090

9191
private const string NodePassStatusRegexString =
92-
@"\[(\w){4}(?<node>[0-9]{1,2})(?<role>:\w+)?\]\[(?<time>\d{1,4}[- /.]\d{1,4}[- /.]\d{1,4}\s\d{1,2}:\d{1,2}:\d{1,2}(\s(AM|PM)){0,1})\]\[(?<status>(PASS|FAIL))\]{1}\s(?<test>.*)";
92+
@"\[(\w){4}(?<node>[0-9]{1,2})(?<role>:[\w-]+)?\]\[(?<time>\d{1,4}[- /.]\d{1,4}[- /.]\d{1,4}\s\d{1,2}:\d{1,2}:\d{1,2}(\s(AM|PM)){0,1})\]\[(?<status>(PASS|FAIL))\]{1}\s(?<test>.*)";
9393
protected static readonly Regex NodePassStatusRegex = new Regex(NodePassStatusRegexString);
9494

9595
private const string NodePassed = "PASS";

src/core/Akka.MultiNodeTestRunner/Discovery.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,12 @@ private List<NodeTest> LoadTestCaseDetails(ITestCaseDiscoveryMessage testCaseDis
7171
{
7272
try
7373
{
74+
#if CORECLR
75+
var specType = testCaseDiscoveryMessage.TestAssembly.Assembly.GetType(testClass.Name).ToRuntimeType();
76+
#else
7477
var testAssembly = Assembly.LoadFrom(testCaseDiscoveryMessage.TestAssembly.Assembly.AssemblyPath);
7578
var specType = testAssembly.GetType(testClass.Name);
79+
#endif
7680
var roles = RoleNames(specType);
7781

7882
var details = roles.Select((r, i) => new NodeTest

0 commit comments

Comments
 (0)