From 7746b79fb5d21a17d055cb2b7dbdbd1c1577a5bc Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 13 Jul 2022 10:46:31 +0100
Subject: [PATCH 1/3] close app after running

---
 tests/Avalonia.IntegrationTests.Appium/TestAppFixture.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/Avalonia.IntegrationTests.Appium/TestAppFixture.cs b/tests/Avalonia.IntegrationTests.Appium/TestAppFixture.cs
index b3385d8ee7..70052b672c 100644
--- a/tests/Avalonia.IntegrationTests.Appium/TestAppFixture.cs
+++ b/tests/Avalonia.IntegrationTests.Appium/TestAppFixture.cs
@@ -57,6 +57,7 @@ namespace Avalonia.IntegrationTests.Appium
         {
             try
             {
+                Session.CloseApp();
                 Session.Close();
             }
             catch

From e0c1bae8422d052d55085bb24507e04480cc0fe5 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 13 Jul 2022 10:56:15 +0100
Subject: [PATCH 2/3] use pkill to close app.

---
 tests/Avalonia.IntegrationTests.Appium/TestAppFixture.cs        | 1 -
 .../Avalonia.IntegrationTests.Appium/macos-clean-build-test.sh  | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/Avalonia.IntegrationTests.Appium/TestAppFixture.cs b/tests/Avalonia.IntegrationTests.Appium/TestAppFixture.cs
index 70052b672c..b3385d8ee7 100644
--- a/tests/Avalonia.IntegrationTests.Appium/TestAppFixture.cs
+++ b/tests/Avalonia.IntegrationTests.Appium/TestAppFixture.cs
@@ -57,7 +57,6 @@ namespace Avalonia.IntegrationTests.Appium
         {
             try
             {
-                Session.CloseApp();
                 Session.Close();
             }
             catch
diff --git a/tests/Avalonia.IntegrationTests.Appium/macos-clean-build-test.sh b/tests/Avalonia.IntegrationTests.Appium/macos-clean-build-test.sh
index 635c593f37..b3cba2c5ea 100755
--- a/tests/Avalonia.IntegrationTests.Appium/macos-clean-build-test.sh
+++ b/tests/Avalonia.IntegrationTests.Appium/macos-clean-build-test.sh
@@ -6,4 +6,6 @@ git clean -xdf
 ./build.sh CompileNative
 ./samples/IntegrationTestApp/bundle.sh
 open -n ./samples/IntegrationTestApp/bin/Debug/net6.0/osx-arm64/publish/IntegrationTestApp.app
+pkill IntegrationTestApp
 dotnet test tests/Avalonia.IntegrationTests.Appium/ -l "console;verbosity=detailed"
+pkill IntegrationTestApp

From d59c9feac9a0d70494fef36a5718af37b1a7f075 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 13 Jul 2022 11:11:58 +0100
Subject: [PATCH 3/3] make sure any existing instances are closed.

---
 tests/Avalonia.IntegrationTests.Appium/macos-clean-build-test.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/Avalonia.IntegrationTests.Appium/macos-clean-build-test.sh b/tests/Avalonia.IntegrationTests.Appium/macos-clean-build-test.sh
index b3cba2c5ea..5018e78d68 100755
--- a/tests/Avalonia.IntegrationTests.Appium/macos-clean-build-test.sh
+++ b/tests/Avalonia.IntegrationTests.Appium/macos-clean-build-test.sh
@@ -3,6 +3,7 @@
 SCRIPT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)
 cd "$SCRIPT_DIR"/../.. || exit
 git clean -xdf
+pkill IntegrationTestApp
 ./build.sh CompileNative
 ./samples/IntegrationTestApp/bundle.sh
 open -n ./samples/IntegrationTestApp/bin/Debug/net6.0/osx-arm64/publish/IntegrationTestApp.app