Cleanup

src/TestUtils/src/UITest.Appium/AppiumAndroidApp.cs

@@ -34,9 +34,6 @@ public static AppiumAndroidApp CreateAndroidApp(Uri remoteAddress, IConfig confi
 			//// TODO: Check for installed package first?
 			//AndroidEmulator.InstallPackage(apkPath, pkgName, outDir);
 			var androidApp = new AppiumAndroidApp(remoteAddress, config);
-			var logs = androidApp.Driver.Manage().Logs;
-			Console.WriteLine($"Available log types: {string.Join(", ", logs.AvailableLogTypes)}");
-			logs.GetLog("logcat"); // do nothing with the result and clear the log buffer
 			androidApp.Driver.ActivateApp(pkgName);
 			return androidApp;
 		}

src/TestUtils/src/UITest.NUnit/UITestBase.cs

@@ -56,10 +56,10 @@ protected virtual void FixtureTeardown()
 		[TearDown]
 		public void UITestBaseTearDown()
 		{
-			SaveAppLogs();
-
 			if (App.AppState == ApplicationState.NotRunning)
 			{
+				SaveAppLogs();
+
 				Reset();
 				FixtureSetup();
 
@@ -72,6 +72,7 @@ public void UITestBaseTearDown()
 			if (testOutcome == ResultState.Error ||
 				testOutcome == ResultState.Failure)
 			{
+				SaveAppLogs();
 				SaveAppSnapshots();
 			}
 		}
@@ -160,6 +161,8 @@ void SaveAppSnapshots([CallerMemberName] string? note = null)
 			else
 				note = $"-{note}-";
 
+			filename = $"{Path.GetFileNameWithoutExtension(filename)}-{Guid.NewGuid().ToString("N")}{Path.GetExtension(filename)}";
+
 			var logDir =
 				Path.GetDirectoryName(Environment.GetEnvironmentVariable("APPIUM_LOG_FILE") ??
 				Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location))!;