Determine extract bundle type properly, clean up after downloading sy…

…mbols path

peptest/peputils.py

@@ -40,18 +40,19 @@
 import zipfile
 import tarfile
 
-def download(url, savepath=None):
+def download(url, savepath=''):
     """
     Save the file located at 'url' into 'savepath'
     If savepath is None, use the last part of the url path.
     Returns the path of the saved file.
     """
     data = urllib2.urlopen(url)
-    if savepath is None:
+    if savepath == '' or os.path.isdir(savepath):
         parsed = urlparse.urlsplit(url)
-        savepath = parsed.path[parsed.path.rfind('/')+1:]
+        filename = parsed.path[parsed.path.rfind('/')+1:]
+        savepath = os.path.join(savepath, filename)
     savedir = os.path.dirname(savepath)
-    if savedir and not os.path.exists(savedir):
+    if savedir != '' and not os.path.exists(savedir):
         os.makedirs(savedir)
     outfile = open(savepath, 'wb')
     outfile.write(data.read())
@@ -69,11 +70,14 @@ def extract(path, savedir=None, delete=False):
     Takes in a tar or zip file and extracts it to savedir
     If savedir is not specified, extracts to path
     If delete is set to True, deletes the bundle at path
+    Returns the list of top level files that were extracted
     """
-    if path.endswith('.zip'):
+    if zipfile.is_zipfile(path):
         bundle = zipfile.ZipFile(path)
-    elif path.endswith('.tar.gz') or path.endswith('.tar.bz2'):
+        namelist = bundle.namelist()
+    elif tarfile.is_tarfile(path):
         bundle = tarfile.open(path)
+        namelist = bundle.getnames()
     else:
         return
     if savedir is None:
@@ -84,3 +88,5 @@ def extract(path, savedir=None, delete=False):
     bundle.close()
     if delete:
         os.remove(path)
+    return [os.path.join(savedir, name) for name in namelist 
+                if len(name.rstrip(os.sep).split(os.sep)) == 1]

peptest/runpeptests.py

@@ -167,9 +167,6 @@ def stop(self):
             if os.path.exists(os.path.join(here, f)):
                 os.remove(os.path.join(here, f))
 
-        if os.path.exists(os.path.join(here, 'symbols')):
-            shutil.rmtree(os.path.join('symbols'))
-
         # delete any minidumps that may have been created
         dumpDir = os.path.join(self.profile.profile, 'minidumps')
         if self.options.profilePath and os.path.exists(dumpDir):
@@ -225,6 +222,11 @@ def checkForCrashes(self, testName=None):
             else:
                 self.logger.warning('No symbols_path or stackwalk path specified, can\'t process dump')
                 break
+
+        # if the symbols path was downloaded, cleanup after ourselves
+        if utils.isURL(self.options.symbolsPath):
+            if os.path.exists(symbolsPath):
+                shutil.rmtree(symbolsPath)
         return foundCrash
 
 class FirefoxPeptest(Peptest):