junit and github actions logger dont gel well together

elastic · Jan 30, 2024 · 2c35cf6 · 2c35cf6
1 parent 3880882
commit 2c35cf6
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 19 deletions.
diff --git a/build/scripts/Targets.fs b/build/scripts/Targets.fs
@@ -45,15 +45,23 @@ let private test _ =
     let junitOutput = Path.Combine(testOutputPath.FullName, "junit-{assembly}-{framework}-test-results.xml")
     let loggerPathArgs = $"LogFilePath=%s{junitOutput}"
     let loggerArg = $"--logger:\"junit;%s{loggerPathArgs}\""
-    let githubActionsLogger = $"--logger:\"GitHubActions;summary.includePassedTests=true\""
+    let githubActionsLogger = $"--logger:\"GitHubActions;summary.includePassedTests=false\""
     let tfmArgs = if OS.Current = OS.Windows then [] else ["-f"; "net8.0"]
+    //exec { run "dotnet" "test" "-c" "release" }
     exec {
         run "dotnet" (
-            ["test"; "-c"; "release"; loggerArg; githubActionsLogger]
+            ["test"; "-c"; "release"; "--no-restore"; "--no-build"; githubActionsLogger]
             @ tfmArgs
             @ ["--"; "RunConfiguration.CollectSourceInformation=true"]
         )
-    } 
+    }
+    (*exec {
+        run "dotnet" (
+            ["test"; "-c"; "release"; "-v"; "diag"; "--no-restore"; "--no-build"; loggerArg; githubActionsLogger]
+            @ tfmArgs
+            @ ["--"; "RunConfiguration.CollectSourceInformation=true"]
+        )
+    } *)
 
 let private validateLicenses _ =
     let args = ["-u"; "-t"; "-i"; "Elastic.OpenTelemetry.sln"; "--use-project-assets-json"

diff --git a/tests/Elastic.OpenTelemetry.IntegrationTests/DistributedFixture/ApmUIBrowserContext.cs b/tests/Elastic.OpenTelemetry.IntegrationTests/DistributedFixture/ApmUIBrowserContext.cs
@@ -58,7 +58,8 @@ public async Task InitializeAsync()
 
 	public string? StorageState { get; set; }
 
-	public async Task<IPage> OpenApmLandingPage(string testName)
+
+	public async Task<IPage> NewProfiledPage(string testName)
 	{
 		var page = await Browser.NewPageAsync(new () { StorageState = StorageState });
 		await page.Context.Tracing.StartAsync(new()
@@ -68,6 +69,14 @@ await page.Context.Tracing.StartAsync(new()
 			Snapshots = true,
 			Sources = true
 		});
+
+		return page;
+	}
+
+
+	public async Task<IPage> OpenApmLandingPage(string testName)
+	{
+		var page = await NewProfiledPage(testName);
 		await page.GotoAsync(KibanaAppUri.ToString());
 		return page;
 	}

diff --git a/tests/Elastic.OpenTelemetry.IntegrationTests/EndToEndTests.cs b/tests/Elastic.OpenTelemetry.IntegrationTests/EndToEndTests.cs
@@ -29,21 +29,7 @@ public async Task LatencyShowsAGraph()
 	}
 
 
-	public async Task InitializeAsync()
-	{
-		_testName = XunitContext.Context.UniqueTestName;
-		_page = await fixture.ApmUI.OpenApmLandingPage(_testName);
-		try
-		{
-			await fixture.ApmUI.WaitForServiceOnOverview(_page);
-		}
-		catch
-		{
-			await fixture.ApmUI.StopTrace(_page, _testName);
-			throw;
-		}
-
-	}
+	public async Task InitializeAsync() => _page = await fixture.ApmUI.NewProfiledPage(_testName);
 
 	public async Task DisposeAsync() => await fixture.ApmUI.StopTrace(_page, XunitContext.Context.TestException == null ? null : _testName);
 }