Don't try to capture vm log files
The logs are now sent direct to logcat in the host
Bug: 275469579
Test: atest odsign_e2e_tests
Change-Id: I3a0b3c0656722b396773be8ee4ef179860a05f95
diff --git a/test/odsign/test-src/com/android/tests/odsign/CompOsDenialHostTest.java b/test/odsign/test-src/com/android/tests/odsign/CompOsDenialHostTest.java
index 16ef562..83e4a39 100644
--- a/test/odsign/test-src/com/android/tests/odsign/CompOsDenialHostTest.java
+++ b/test/odsign/test-src/com/android/tests/odsign/CompOsDenialHostTest.java
@@ -96,18 +96,6 @@
}
@Test
- public void vmLogCollector() throws Exception {
- // This is not a test. The purpose is to collect VM's log, which is generated once per
- // class, in beforeClassWithDevice before any tests run. It's implemented as a test methond
- // because TestLogData doesn't seem to work in a class method.
- OdsignTestUtils testUtils = new OdsignTestUtils(getTestInformation());
- testUtils.archiveLogThenDelete(mTestLogs, CompOsTestUtils.APEXDATA_DIR + "/vm.log",
- "vm.log-CompOsDenialHostTest");
- testUtils.archiveLogThenDelete(mTestLogs, CompOsTestUtils.APEXDATA_DIR + "/vm_console.log",
- "vm_console.log-CompOsDenialHostTest");
- }
-
- @Test
public void denyDueToInconsistentFileName() throws Exception {
// Attack emulation: swap file names
String[] paths = getAllPendingOdexPaths();
diff --git a/test/odsign/test-src/com/android/tests/odsign/CompOsSigningHostTest.java b/test/odsign/test-src/com/android/tests/odsign/CompOsSigningHostTest.java
index bb382d6..134cff9 100644
--- a/test/odsign/test-src/com/android/tests/odsign/CompOsSigningHostTest.java
+++ b/test/odsign/test-src/com/android/tests/odsign/CompOsSigningHostTest.java
@@ -20,12 +20,8 @@
import static com.android.tradefed.testtype.DeviceJUnit4ClassRunner.TestLogData;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import static org.junit.Assume.assumeTrue;
import com.android.tests.odsign.annotation.CtsTestCase;
-import com.android.tradefed.device.DeviceNotAvailableException;
import com.android.tradefed.device.ITestDevice;
import com.android.tradefed.invoker.TestInformation;
import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
@@ -36,8 +32,6 @@
import org.junit.Test;
import org.junit.runner.RunWith;
-import java.util.concurrent.TimeUnit;
-
/**
* Test to check if CompOS works properly.
*
@@ -89,21 +83,6 @@
}
@Test
- public void vmLogCollector() throws Exception {
- // This is not a test. The purpose is to collect VM's log, which is generated once per
- // class. It's implemented as a test methond because TestLogData doesn't seem to work in a
- // class method.
-
- // The log files are currently only available through a rooted shell.
- OdsignTestUtils testUtils = new OdsignTestUtils(getTestInformation());
-
- testUtils.archiveLogThenDelete(mTestLogs, CompOsTestUtils.APEXDATA_DIR + "/vm.log",
- "vm.log-CompOsSigningHostTest");
- testUtils.archiveLogThenDelete(mTestLogs, CompOsTestUtils.APEXDATA_DIR + "/vm_console.log",
- "vm_console.log-CompOsSigningHostTest");
- }
-
- @Test
@CtsTestCase
public void checkFileChecksums() throws Exception {
CompOsTestUtils compOsTestUtils = new CompOsTestUtils(getDevice());
diff --git a/test/odsign/test-src/com/android/tests/odsign/OdsignTestUtils.java b/test/odsign/test-src/com/android/tests/odsign/OdsignTestUtils.java
index c8d2516..79778dc 100644
--- a/test/odsign/test-src/com/android/tests/odsign/OdsignTestUtils.java
+++ b/test/odsign/test-src/com/android/tests/odsign/OdsignTestUtils.java
@@ -16,8 +16,6 @@
package com.android.tests.odsign;
-import static com.android.tradefed.testtype.DeviceJUnit4ClassRunner.TestLogData;
-
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
@@ -27,22 +25,17 @@
import android.cts.install.lib.host.InstallUtilsHost;
import com.android.tradefed.device.DeviceNotAvailableException;
-import com.android.tradefed.device.ITestDevice;
import com.android.tradefed.device.TestDeviceOptions;
import com.android.tradefed.invoker.TestInformation;
-import com.android.tradefed.result.FileInputStreamSource;
-import com.android.tradefed.result.LogDataType;
import com.android.tradefed.util.CommandResult;
import com.google.common.io.ByteStreams;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
@@ -58,6 +51,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Stream;
+
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -379,17 +373,6 @@
return result.getStdout().trim();
}
- public void archiveLogThenDelete(TestLogData logs, String remotePath, String localName)
- throws DeviceNotAvailableException {
- ITestDevice device = mTestInfo.getDevice();
- File logFile = device.pullFile(remotePath);
- if (logFile != null) {
- logs.addTestLog(localName, LogDataType.TEXT, new FileInputStreamSource(logFile));
- // Delete to avoid confusing logs from a previous run, just in case.
- device.deleteFile(remotePath);
- }
- }
-
public File copyResourceToFile(String resourceName) throws Exception {
File file = File.createTempFile("odsign_e2e_tests", ".tmp");
file.deleteOnExit();