summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authornirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-29 19:18:49 +0000
committernirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-29 19:18:49 +0000
commit554436b584f8e49c7ede4d4a0b3dd0e4b49379bb (patch)
tree991dc3f0a492b6b71582a945ee25d9e2d7cc70f5 /chrome/test
parent48a76bb620e8638dc2979e0a3554b402d168f8f9 (diff)
downloadchromium_src-554436b584f8e49c7ede4d4a0b3dd0e4b49379bb.zip
chromium_src-554436b584f8e49c7ede4d4a0b3dd0e4b49379bb.tar.gz
chromium_src-554436b584f8e49c7ede4d4a0b3dd0e4b49379bb.tar.bz2
Use CHROME_HEADLESS to enable crash reporter in pyauto on linux/mac
Enable the disabled pyauto test. BUG=57189 TEST=crash_reporter.py on official build Review URL: http://codereview.chromium.org/3530003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60971 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/functional/PYAUTO_TESTS1
-rw-r--r--chrome/test/pyautolib/pyauto.py8
2 files changed, 2 insertions, 7 deletions
diff --git a/chrome/test/functional/PYAUTO_TESTS b/chrome/test/functional/PYAUTO_TESTS
index 55e1ad8..b79dadbf 100644
--- a/chrome/test/functional/PYAUTO_TESTS
+++ b/chrome/test/functional/PYAUTO_TESTS
@@ -69,7 +69,6 @@
# codesign tests should run *after* signing. crbug.com/50481
'-codesign',
'-content.ContentTest.testThreeWindows', # crbug.com/47457
- '-crash_reporter', # --enable-crash-reporter not working. crbug.com/57189
],
'linux': [ # linux != chromeos
diff --git a/chrome/test/pyautolib/pyauto.py b/chrome/test/pyautolib/pyauto.py
index 7b20154..3fed9f71 100644
--- a/chrome/test/pyautolib/pyauto.py
+++ b/chrome/test/pyautolib/pyauto.py
@@ -1670,12 +1670,8 @@ class Main(object):
suite_args = [sys.argv[0]]
chrome_flags = self._options.chrome_flags
- # Enable crash reporter by default on posix.
- # On windows, the choice to enable/disable crash reporting is made when
- # downloading the installer.
- # TODO(nirnimesh): Figure out a way to control this from here on Win too.
- if PyUITest.IsPosix():
- chrome_flags += ' --enable-crash-reporter'
+ # Set CHROME_HEADLESS. It enables crash reporter on posix.
+ os.putenv('CHROME_HEADLESS', '1')
# --dom-automation added in PyUITestBase::PyUITestBase()
suite_args.append('--extra-chrome-flags=%s' % chrome_flags)