summaryrefslogtreecommitdiffstats
path: root/chrome/test/pyautolib
diff options
context:
space:
mode:
authordtu@chromium.org <dtu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-27 23:38:06 +0000
committerdtu@chromium.org <dtu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-27 23:38:06 +0000
commit57813358a04dbe1c2390e05814d68697468a1d46 (patch)
tree419fba810d906b17eba58a63eb228e8625e1df5e /chrome/test/pyautolib
parent3f98865ac0fadaa86f1dbeacadcb02c204b3afd5 (diff)
downloadchromium_src-57813358a04dbe1c2390e05814d68697468a1d46.zip
chromium_src-57813358a04dbe1c2390e05814d68697468a1d46.tar.gz
chromium_src-57813358a04dbe1c2390e05814d68697468a1d46.tar.bz2
PyAuto clears the profile directory between tests, but that directory includes the Chrome logs. Add the "log" directory as an exception.
BUG=chromium-os:14610 TEST=Manual. Review URL: http://codereview.chromium.org/6905078 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83254 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/pyautolib')
-rw-r--r--chrome/test/pyautolib/pyauto.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/pyautolib/pyauto.py b/chrome/test/pyautolib/pyauto.py
index f40d79e..d9a6a08 100644
--- a/chrome/test/pyautolib/pyauto.py
+++ b/chrome/test/pyautolib/pyauto.py
@@ -213,7 +213,6 @@ class PyUITest(pyautolib.PyUITestBase, unittest.TestCase):
return os.path.isfile(consent_file) and len(open(consent_file).read())
if not _HasValidConsentFile():
client_id = hashlib.md5('abcdefgh').hexdigest()
- logging.debug('Using CLIENT_ID=%s' % client_id)
open(consent_file, 'w').write(client_id)
assert _HasValidConsentFile(), 'Could not create %s' % consent_file
@@ -238,7 +237,8 @@ class PyUITest(pyautolib.PyUITestBase, unittest.TestCase):
"""
profile_dir = '/home/chronos/user'
for item in os.listdir(profile_dir):
- if item != '.pki': # Causes stateful partition to get erased
+ # Deleting .pki causes stateful partition to get erased
+ if item != '.pki' and item != 'log':
pyauto_utils.RemovePath(os.path.join(profile_dir, item))
chronos_dir = '/home/chronos'