commit 44a188ae98bd9abacde7d03a000332aaca9fb9e4
author Keith Haddow <haddowk@chromium.org> Mon Jul 16 16:42:23 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jul 16 16:42:23 2018 -0700
tree 739328246835686f73a81323828459a77ce868f9
parent f985219e2b1b18e154f7806c00a6013b22d7f6dc
parent 3bc3be032e5005fe7a9206f24c29696a83811495

[autotest] Fix issue where offloaded jobs are never pruned.
am: 3bc3be032e

Change-Id: I0ff217597f7d6d20ef50ce7e774de0d9547647d9

site_utils/gs_offloader.py

diff --git a/site_utils/gs_offloader.py b/site_utils/gs_offloader.py
index 53cc1d4..a85700e 100755
--- a/site_utils/gs_offloader.py
+++ b/site_utils/gs_offloader.py
@@ -921,9 +921,7 @@
         new_job_count = 0
         for cls in self._jobdir_classes:
             for resultsdir in cls.get_job_directories():
-                if (
-                        resultsdir in self._open_jobs
-                        or _is_uploaded(resultsdir)):
+                if resultsdir in self._open_jobs:
                     continue
                 self._open_jobs[resultsdir] = cls(resultsdir)
                 new_job_count += 1

site_utils/job_directories.py

diff --git a/site_utils/job_directories.py b/site_utils/job_directories.py
index fa5ff89..b1c04a9 100755
--- a/site_utils/job_directories.py
+++ b/site_utils/job_directories.py
@@ -187,7 +187,7 @@
         _remove_log_directory_contents(dirname)
 
     # Finally check if there's anything left to offload.
-    if not os.listdir(self.dirname):
+    if os.path.exists(self.dirname) and not os.listdir(self.dirname):
       shutil.rmtree(self.dirname)
       return False
     return True