From 45ef9235622f2244ab2687cedde000dfbbbd5475 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Tue, 28 Feb 2023 23:03:13 +0100 Subject: [PATCH 1/5] Add display names to tasks. --- azure-pipelines-integrationtests.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/azure-pipelines-integrationtests.yml b/azure-pipelines-integrationtests.yml index 7221fe4657..68c649fbf9 100644 --- a/azure-pipelines-integrationtests.yml +++ b/azure-pipelines-integrationtests.yml @@ -15,6 +15,7 @@ jobs: version: 7.0.101 - script: system_profiler SPDisplaysDataType |grep Resolution + displayName: 'Get Resolution' - script: | sudo xcode-select -s /Applications/Xcode.app/Contents/Developer @@ -27,8 +28,10 @@ jobs: ./samples/IntegrationTestApp/bundle.sh open -n ./samples/IntegrationTestApp/bin/Debug/net7.0/osx-arm64/publish/IntegrationTestApp.app pkill IntegrationTestApp + displayName: 'Build IntegrationTestApp' - task: DotNetCoreCLI@2 + displayName: 'Run Integration Tests' inputs: command: 'test' projects: 'tests/Avalonia.IntegrationTests.Appium/Avalonia.IntegrationTests.Appium.csproj' @@ -36,6 +39,7 @@ jobs: - script: | pkill IntegrationTestApp pkill node + displayName: 'Stop Appium' - job: Windows @@ -60,11 +64,13 @@ jobs: displayName: 'Start WinAppDriver' - task: DotNetCoreCLI@2 + displayName: 'Build IntegrationTestApp' inputs: command: 'build' projects: 'samples/IntegrationTestApp/IntegrationTestApp.csproj' - task: DotNetCoreCLI@2 + displayName: 'Run Integration Tests' retryCountOnTaskFailure: 3 inputs: command: 'test' From 8f04fcd850e2d0d9c5d208dd6fa890bd25be501e Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Tue, 28 Feb 2023 23:05:06 +0100 Subject: [PATCH 2/5] Detailed logs on macOS. --- azure-pipelines-integrationtests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-pipelines-integrationtests.yml b/azure-pipelines-integrationtests.yml index 68c649fbf9..8a526cc32e 100644 --- a/azure-pipelines-integrationtests.yml +++ b/azure-pipelines-integrationtests.yml @@ -35,6 +35,7 @@ jobs: inputs: command: 'test' projects: 'tests/Avalonia.IntegrationTests.Appium/Avalonia.IntegrationTests.Appium.csproj' + arguments: '-l "console;verbosity=detailed"' - script: | pkill IntegrationTestApp From 0e0db41f055a5c90d455a2c4b2b4021ead630fe7 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Wed, 1 Mar 2023 10:31:35 +0100 Subject: [PATCH 3/5] Publish appium logs on failure. --- azure-pipelines-integrationtests.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/azure-pipelines-integrationtests.yml b/azure-pipelines-integrationtests.yml index 8a526cc32e..194367c076 100644 --- a/azure-pipelines-integrationtests.yml +++ b/azure-pipelines-integrationtests.yml @@ -20,7 +20,7 @@ jobs: - script: | sudo xcode-select -s /Applications/Xcode.app/Contents/Developer pkill node - appium & + appium > appium.out & pkill IntegrationTestApp ./build.sh CompileNative rm -rf $(osascript -e "POSIX path of (path to application id \"net.avaloniaui.avalonia.integrationtestapp\")") @@ -42,6 +42,9 @@ jobs: pkill node displayName: 'Stop Appium' + - publish: appium.out + displayName: 'Publish appium logs on failure' + condition: failed() - job: Windows pool: From 8b5114357f3652d9bedf5310b40aea4a84d1ccb0 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Wed, 1 Mar 2023 13:52:31 +0100 Subject: [PATCH 4/5] Skip flaky test. --- tests/Avalonia.IntegrationTests.Appium/WindowTests_MacOS.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Avalonia.IntegrationTests.Appium/WindowTests_MacOS.cs b/tests/Avalonia.IntegrationTests.Appium/WindowTests_MacOS.cs index 2eaaf2e0a8..90fdc2511f 100644 --- a/tests/Avalonia.IntegrationTests.Appium/WindowTests_MacOS.cs +++ b/tests/Avalonia.IntegrationTests.Appium/WindowTests_MacOS.cs @@ -163,7 +163,7 @@ namespace Avalonia.IntegrationTests.Appium } } - [PlatformFact(TestPlatforms.MacOS)] + [PlatformFact(TestPlatforms.MacOS, Skip = "Flaky test")] public void Does_Not_Switch_Space_From_FullScreen_To_Main_Desktop_When_FullScreen_Window_Clicked() { // Issue #9565 From 39126b9a8ca5de80440fac9985611cec89757cb9 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 2 Mar 2023 12:10:35 +0000 Subject: [PATCH 5/5] skip flaky test on macos. --- tests/Avalonia.IntegrationTests.Appium/GestureTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Avalonia.IntegrationTests.Appium/GestureTests.cs b/tests/Avalonia.IntegrationTests.Appium/GestureTests.cs index 65864cc649..775ee723cb 100644 --- a/tests/Avalonia.IntegrationTests.Appium/GestureTests.cs +++ b/tests/Avalonia.IntegrationTests.Appium/GestureTests.cs @@ -74,7 +74,7 @@ namespace Avalonia.IntegrationTests.Appium Assert.Equal("DoubleTapped", lastGesture.Text); } - [Fact] + [PlatformFact(TestPlatforms.Windows | TestPlatforms.Linux)] public void DoubleTapped_Is_Raised_2() { var border = _session.FindElementByAccessibilityId("GestureBorder");