summaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorsullivan <sullivan@chromium.org>2014-12-04 09:33:08 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-04 17:33:34 +0000
commitd672d0bca59952c5b7b7ac58d6dcc68134d33ac8 (patch)
tree9126c00009a139485961141dc1cdc765b4f79741 /testing
parent97ad0b4aa3fd6b3705f9a2c6d20e95527bc88f6f (diff)
downloadchromium_src-d672d0bca59952c5b7b7ac58d6dcc68134d33ac8.zip
chromium_src-d672d0bca59952c5b7b7ac58d6dcc68134d33ac8.tar.gz
chromium_src-d672d0bca59952c5b7b7ac58d6dcc68134d33ac8.tar.bz2
Revert of Revert of Revert of Revert of Revert of Disable telemetry tests for Mac 10.9. (patchset #1 id:1 of https://codereview.chromium.org/776663002/)
Reason for revert: We think this was fixed by https://codereview.chromium.org/750093007 Original issue's description: > Revert of Revert of Revert of Revert of Disable telemetry tests for Mac 10.9. (patchset #1 id:1 of https://codereview.chromium.org/734433004/) > > Reason for revert: > Getting errors like this: > Telemetry needs to run /usr/bin/pkill under sudo. Please authenticate. > > Original issue's description: > > Revert of Revert of Revert of Disable telemetry tests for Mac 10.9. (patchset #1 id:1 of https://codereview.chromium.org/751533002/) > > > > Reason for revert: > > Failures fixed in https://codereview.chromium.org/720413006/, these tests pass locally for me on Mac 10.9 > > > > Original issue's description: > > > Revert of Revert of Disable telemetry tests for Mac 10.9. (patchset #1 id:1 of https://codereview.chromium.org/744283002/) > > > > > > Reason for revert: > > > This re-enabling of tests has left a trail of redness on Mac 10.9 (more than one failure). If you expect tests to fail as a result of re-enabling again, then please watch the tree and disable the ones failing (assuming that is the appropriate course of action in the first place, which I'm not sure of). > > > > > > Original issue's description: > > > > Revert of Disable telemetry tests for Mac 10.9. (patchset #2 id:20001 of https://codereview.chromium.org/706703003/) > > > > > > > > Reason for revert: > > > > Second attempt to re-enable tests. I think there may still be one test failure, but we can disable that one test. If there's more than one, revert this. > > > > > > > > Original issue's description: > > > > > Disable telemetry tests for Mac 10.9. > > > > > > > > > > The telemetry tests are failing consistently on OSX 10.9. > > > > > > > > > > BUG=420615 > > > > > R=tonyg@chromium.org > > > > > > > > > > Committed: https://crrev.com/5503de1eeae0437c1f8160d69b04d6241bc5e974 > > > > > Cr-Commit-Position: refs/heads/master@{#303114} > > > > > > > > TBR=phajdan.jr@chromium.org,tonyg@chromium.org,garykac@chromium.org > > > > NOTREECHECKS=true > > > > NOTRY=true > > > > BUG=420615 > > > > > > > > Committed: https://crrev.com/10e58e6dfbe4d9dae5841ceb9eb0180cce1aac14 > > > > Cr-Commit-Position: refs/heads/master@{#305096} > > > > > > TBR=phajdan.jr@chromium.org,tonyg@chromium.org,garykac@chromium.org,dtu@chromium.org > > > NOTREECHECKS=true > > > NOTRY=true > > > BUG=420615 > > > > > > Committed: https://crrev.com/8ef425c1d3058afabd36fd9226385c142ba5f280 > > > Cr-Commit-Position: refs/heads/master@{#305200} > > > > TBR=phajdan.jr@chromium.org,tonyg@chromium.org,garykac@chromium.org,dtu@chromium.org,finnur@chromium.org > > NOTREECHECKS=true > > NOTRY=true > > BUG=420615 > > > > Committed: https://crrev.com/2e93412cdb1175bec8bc497cf48bf35459eb35df > > Cr-Commit-Position: refs/heads/master@{#306430} > > TBR=phajdan.jr@chromium.org,tonyg@chromium.org,garykac@chromium.org,dtu@chromium.org,finnur@chromium.org > NOTREECHECKS=true > NOTRY=true > BUG=420615 > > Committed: https://crrev.com/527ed4e9b27b1fb40e7c219d3066519139910864 > Cr-Commit-Position: refs/heads/master@{#306451} TBR=phajdan.jr@chromium.org,tonyg@chromium.org,garykac@chromium.org,dtu@chromium.org,finnur@chromium.org NOTREECHECKS=true NOTRY=true BUG=420615 Review URL: https://codereview.chromium.org/776313002 Cr-Commit-Position: refs/heads/master@{#306849}
Diffstat (limited to 'testing')
-rw-r--r--testing/buildbot/chromium.mac.json16
1 files changed, 16 insertions, 0 deletions
diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json
index cff26cd..0ea46e9 100644
--- a/testing/buildbot/chromium.mac.json
+++ b/testing/buildbot/chromium.mac.json
@@ -280,6 +280,14 @@
],
"scripts": [
{
+ "name": "telemetry_unittests",
+ "script": "telemetry_unittests.py"
+ },
+ {
+ "name": "telemetry_perf_unittests",
+ "script": "telemetry_perf_unittests.py"
+ },
+ {
"name": "nacl_integration",
"script": "nacl_integration.py"
}
@@ -371,6 +379,14 @@
],
"scripts": [
{
+ "name": "telemetry_unittests",
+ "script": "telemetry_unittests.py"
+ },
+ {
+ "name": "telemetry_perf_unittests",
+ "script": "telemetry_perf_unittests.py"
+ },
+ {
"name": "nacl_integration",
"script": "nacl_integration.py"
}