[tests] Clear adb logcat after we collect the logcat output (#2495)

Clearing `adb logcat` output after running an on-device test makes it easier to find problems within the logcat output, as it will only contain the information relevant to that particular test run. As we clear it after the run, the first test logcat on a freshly started emulator will also contain the startup info in case it is needed.
dotnet · Dec 7, 2018 · 423c81a · 423c81a
1 parent 3221282
commit 423c81a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/...roid.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/RunInstrumentationTests.cs b/...roid.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/RunInstrumentationTests.cs
@@ -14,7 +14,8 @@ public class RunInstrumentationTests : Adb
 		const                   string              TestResultsPathResult       = "INSTRUMENTATION_RESULT: nunit2-results-path=";
 		const                   int                 StateRunInstrumentation     = 0;
 		const                   int                 StateGetLogcat              = 1;
-		const                   int                 StatePullFiles              = 2;
+		const                   int                 StateClearLogcat            = 2;
+		const                   int                 StatePullFiles              = 3;
 		const                   int                 MaxState                    = StatePullFiles;
 
 		public                  string              TestFixture                 { get; set; }
@@ -81,6 +82,10 @@ public override bool Execute ()
 					StdoutAppend = true,
 				},
 
+				new CommandInfo {
+					ArgumentsString = $"{AdbTarget} {AdbOptions} logcat -c",
+				},
+
 				new CommandInfo {
 					ArgumentsGenerator = () => $"{AdbTarget} {AdbOptions} pull \"{targetTestResultsPath}\" \"{NUnit2TestResultsFile}\"",
 					ShouldRun = () => !String.IsNullOrEmpty (targetTestResultsPath)

diff --git a/...s/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/RunUITests.cs b/...s/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/RunUITests.cs
@@ -8,6 +8,7 @@ public class RunUITests : Adb
 	{
 		const                   int                 StateRunTests               = 0;
 		const                   int                 StateGetLogcat              = 1;
+		const                   int                 StateClearLogcat            = 2;
 
 		[Required]
 		public                  string              Activity                    { get; set; }
@@ -37,6 +38,11 @@ protected virtual void AfterCommand (int commandIndex, CommandInfo info)
 					StdoutFilePath = LogcatFilename,
 					StdoutAppend = true,
 				},
+
+				new CommandInfo {
+					ArgumentsString = $"{AdbTarget} {AdbOptions} logcat -c",
+				},
+
 			};
 		}
 	}