From 9d515242e88fc01467e0000e89f7c90370d94cc2 Mon Sep 17 00:00:00 2001 From: "jochen@chromium.org" Date: Fri, 28 Feb 2014 12:32:54 +0000 Subject: [PATCH] When upgrading the test data twice, don't bail out because of an existing backup BUG=none R=jkummerow@chromium.org LOG=n Review URL: https://codereview.chromium.org/183853004 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@19605 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- test/mozilla/testcfg.py | 5 ++++- test/test262/testcfg.py | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/test/mozilla/testcfg.py b/test/mozilla/testcfg.py index 775a239..70a7ac6 100644 --- a/test/mozilla/testcfg.py +++ b/test/mozilla/testcfg.py @@ -132,8 +132,11 @@ class MozillaTestSuite(testsuite.TestSuite): # 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_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: diff --git a/test/test262/testcfg.py b/test/test262/testcfg.py index 89f729d..d4a7f56 100644 --- a/test/test262/testcfg.py +++ b/test/test262/testcfg.py @@ -28,6 +28,7 @@ import hashlib import os +import shutil import sys import tarfile import urllib @@ -98,6 +99,8 @@ class Test262TestSuite(testsuite.TestSuite): print "Downloading test data from %s ..." % archive_url urllib.urlretrieve(archive_url, archive_name) if os.path.exists(directory_name): + if os.path.exists(directory_old_name): + shutil.rmtree(directory_old_name) os.rename(directory_name, directory_old_name) if not os.path.exists(directory_name): print "Extracting test262-%s.tar.bz2 ..." % revision -- 2.7.4