commit 27e142244c2a1e7e8d832eae4fadb179438e4c00
author Tsion Behailu <tsion@google.com> Wed Apr 20 12:34:56 2016 -0700
committer Tsion Behailu <tsion@google.com> Thu Apr 21 11:33:11 2016 -0700
tree 20c3c3a852c9759d6e308fc92420c9181f30d1a5
parent cf9e66e73df26a7436bdfe1c9aa4d2c541d8ba99

Save the full test results folder

TODO - save path to the full test results folder and save in new tag in test
result XML

BUG: 27650048
Change-Id: I30b95e3b5bc3b30419d06955324206c998489b5a

common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/ResultReporter.java

diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/ResultReporter.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/ResultReporter.java
index 9f9728b..1b00976 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/ResultReporter.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/ResultReporter.java
@@ -35,6 +35,7 @@
 import com.android.tradefed.config.Option.Importance;
 import com.android.tradefed.config.OptionClass;
 import com.android.tradefed.log.LogUtil.CLog;
+import com.android.tradefed.result.FileInputStreamSource;
 import com.android.tradefed.result.ILogSaver;
 import com.android.tradefed.result.ILogSaverListener;
 import com.android.tradefed.result.ITestInvocationListener;
@@ -47,6 +48,7 @@
 import com.android.tradefed.util.FileUtil;
 import com.android.tradefed.util.StreamUtil;
 import com.android.tradefed.util.TimeUtil;
+import com.android.tradefed.util.ZipUtil;
 
 import org.xmlpull.v1.XmlPullParserException;
 
@@ -331,7 +333,9 @@
             logResult("Result saved at: %s", resultFile.getCanonicalPath());
             copyDynamicConfigFiles(mBuildHelper.getDynamicConfigFiles(), mResultDir);
             copyFormattingFiles(mResultDir);
-            zipResults(mResultDir);
+            // Zip the full test results directory.
+            File zippedResults = zipResults(mResultDir);
+            // Save the test result XML.
             if (mUseLogSaver) {
                 FileInputStream fis = null;
                 try {
@@ -343,6 +347,16 @@
                 } finally {
                     StreamUtil.close(fis);
                 }
+                // Save the full results folder.
+                if (zippedResults != null) {
+                    FileInputStreamSource fiss = null;
+                    try {
+                        fiss =  new FileInputStreamSource(zippedResults);
+                        testLog("results", LogDataType.ZIP, fiss);
+                    } finally {
+                        StreamUtil.cancel(fiss);
+                    }
+                }
             }
             if (mResultServer != null && !mResultServer.trim().isEmpty() && !mDisableResultPosting) {
                 try {
@@ -460,17 +474,18 @@
      *
      * @param resultsDir
      */
-    @SuppressWarnings("deprecation")
-    private static void zipResults(File resultsDir) {
+    private static File zipResults(File resultsDir) {
+        File zipResultFile = null;
         try {
             // create a file in parent directory, with same name as resultsDir
-            File zipResultFile = new File(resultsDir.getParent(), String.format("%s.zip",
+            zipResultFile = new File(resultsDir.getParent(), String.format("%s.zip",
                     resultsDir.getName()));
-            FileUtil.createZip(resultsDir, zipResultFile);
+            ZipUtil.createZip(resultsDir, zipResultFile);
         } catch (IOException e) {
             Log.w(ResultReporter.class.getSimpleName(),
                     String.format("Failed to create zip for %s", resultsDir.getName()));
         }
+        return zipResultFile;
     }
 
     /**