When upgrading the test data twice, don't bail out because of an existing backup

test/mozilla/testcfg.py

 # Copyright 2008 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
@@ skipping 114 matching lines @@
     checked_out_version = None
     if os.path.exists(versionfile):
       with open(versionfile) as f:
         checked_out_version = f.read()
     if checked_out_version == MOZILLA_VERSION:
       os.chdir(old_cwd)
       return
 
     # If we have a local archive file with the test data, extract it.
     directory_name = "data"
+    directory_name_old = "data.old"
     if os.path.exists(directory_name):
-      os.rename(directory_name, "data.old")
+      if os.path.exists(directory_name_old):
+        shutil.rmtree(directory_old_name)

[Jakob Kummerow, 2014/02/28 12:27:10]

s/directory_old_name/directory_name_old/ !

+      os.rename(directory_name, directory_name_old)
     archive_file = "downloaded_%s.tar.gz" % MOZILLA_VERSION
     if os.path.exists(archive_file):
       with tarfile.open(archive_file, "r:gz") as tar:
         tar.extractall()
       with open(versionfile, "w") as f:
         f.write(MOZILLA_VERSION)
       os.chdir(old_cwd)
       return
 
     # No cached copy. Check out via CVS, and pack as .tar.gz for later use.
     command = ("cvs -d :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot"
                " co -D %s mozilla/js/tests" % MOZILLA_VERSION)
     code = subprocess.call(command, shell=True)
     if code != 0:
       os.chdir(old_cwd)
       raise Exception("Error checking out Mozilla test suite!")
     os.rename(os.path.join("mozilla", "js", "tests"), directory_name)
     shutil.rmtree("mozilla")
     with tarfile.open(archive_file, "w:gz") as tar:
       tar.add("data")
     with open(versionfile, "w") as f:
       f.write(MOZILLA_VERSION)
     os.chdir(old_cwd)
 
 
 def GetSuite(name, root):
   return MozillaTestSuite(name, root)