Cleanup Cache Stored State

tools/isolate/run_test_from_archive.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Reads a manifest, creates a tree of hardlinks and runs the test.
 
 Keeps a local cache.
 """
 
@@ skipping 157 matching lines @@
     if os.path.isfile(self.state_file):
       try:
         self.state = json.load(open(self.state_file, 'rb'))
       except ValueError:
         # Too bad. The file will be overwritten and the cache cleared.
         pass
     self.trim()
 
   def trim(self):
     """Trims anything we don't know, make sure enough free space exists."""
+    # Ensure that all files listed in the state still exist.
+    for f in self.state:
+      if not os.path.exists(os.path.join(self.cache_dir, f)):
+        self.state.remove(f)
+
     for f in os.listdir(self.cache_dir):
       if f == self.STATE_FILE or f in self.state:
         continue
       logging.warn('Unknown file %s from cache' % f)
       # Insert as the oldest file. It will be deleted eventually if not
       # accessed.
       self.state.insert(0, f)
 
     # Ensure enough free space.
     while (
@@ skipping 127 matching lines @@
     parser.error('Unsupported args %s' % ' '.join(args))
 
   manifest = json.load(open_remote(options.manifest))
   return run_tha_test(
       manifest, os.path.abspath(options.cache), options.remote,
       options.max_cache_size, options.min_free_space)
 
 
 if __name__ == '__main__':
   sys.exit(main())