Merge "Collect screenshot on test failure" into main
diff --git a/tests/Android.bp b/tests/Android.bp
index c77e8af..4dfc7dd 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -48,6 +48,7 @@
"androidx.test.espresso.intents",
"androidx.test.espresso.web",
"androidx.test.ext.junit",
+ "collector-device-lib",
"kotlin-test",
"libnanohttpd",
"net-tests-utils",
diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml
index 72fdd6a..57ead69 100644
--- a/tests/AndroidTest.xml
+++ b/tests/AndroidTest.xml
@@ -29,5 +29,12 @@
<test class="com.android.tradefed.testtype.AndroidJUnitTest" >
<option name="package" value="com.android.captiveportallogin.tests" />
<option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />
+ <option name="device-listeners" value="android.device.collectors.ScreenshotOnFailureCollector" />
</test>
+
+ <metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector">
+ <option name="pull-pattern-keys" value="android.device.collectors.ScreenshotOnFailureCollector.*\.png"/>
+ <option name="directory-keys" value="/data/user/0/com.android.captiveportallogin.tests/files" />
+ <option name="collect-on-run-ended-only" value="false" />
+ </metrics_collector>
</configuration>
