Cleanup in downloads tests

chrome/test/functional/downloads.py

 #!/usr/bin/python
 # Copyright (c) 2010 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.
 
 import filecmp
 import logging
 import os
 import shutil
 import sys
 import tempfile
 import time
 import urllib
 
 import pyauto_functional  # Must be imported before pyauto
 import pyauto
+import pyauto_utils
 
 
 class DownloadsTest(pyauto.PyUITest):
   """TestCase for Downloads."""
 
+  def setUp(self):
+    pyauto.PyUITest.setUp(self)
+    # Record all entries in the download dir
+    download_dir = self.GetDownloadDirectory().value()
+    self._existing_downloads = []
+    if os.path.isdir(download_dir):
+      self._existing_downloads += os.listdir(download_dir)
+
+  def tearDown(self):
+    # Cleanup all files we created in the download dir
+    download_dir = self.GetDownloadDirectory().value()
+    if os.path.isdir(download_dir):
+      for name in os.listdir(download_dir):
+        if name not in self._existing_downloads:
+          pyauto_utils.RemovePath(os.path.join(download_dir, name))
+    pyauto.PyUITest.tearDown(self)
+
   def _GetDangerousDownload(self):
     """Returns the file url for a dangerous download for this OS."""
     sub_path = os.path.join(self.DataDir(), 'downloads', 'dangerous')
     if self.IsMac():
       return os.path.join(sub_path, 'dangerous.dmg')
     return os.path.join(sub_path, 'dangerous.exe')
 
   def _EqualFileContents(self, file1, file2):
     """Determine if 2 given files have the same contents."""
     if not (os.path.exists(file1) and os.path.exists(file2)):
@@ skipping 206 matching lines @@
     # Trigger the download service to get loaded after restart.
     self.NavigateToURL('chrome://downloads/')
     # Verify that there's no download shelf anymore.
     self.assertFalse(self.IsDownloadShelfVisible(),
                      'Download shelf persisted browser restart.')
     # Verify that the download history persists.
     downloads = self.GetDownloadsInfo().Downloads()
     self.assertEqual(1, len(downloads))
     self.assertEqual('a_zip_file.zip', downloads[0]['file_name'])
     self.assertEqual(file_url, downloads[0]['url'])
+    os.path.exists(downloaded_pkg) and os.remove(downloaded_pkg)
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()