Permalink
Browse files

Merging from default

changeset:   1957:5f99280ea2af
parent:      1954:4414dbcecb75
user:        Rail Aliiev <rail@mozilla.com>
date:        Mon Dec 19 10:26:28 2011 -0500
summary:     Bug 707941 - Improve token generation step. r=catlee

changeset:   1958:7f86840c319d
tag:         tip
user:        Mike Taylor <bear@mozilla.com>
date:        Mon Dec 19 11:52:25 2011 -0500
summary:     bug 711179 r=catlee bustage fix for missing symbols for non-mobile tests

--HG--
branch : production-0.8
  • Loading branch information...
2 parents 8a52ac9 + c1e2379 commit eb3e9ea0aea8b00b75002e7573bdcd06928272ec Mike Taylor committed Dec 19, 2011
Showing with 15 additions and 7 deletions.
  1. +12 −4 steps/signing.py
  2. +3 −3 steps/unittest.py
View
@@ -1,4 +1,5 @@
from urllib import urlencode
+from random import shuffle
from OpenSSL.SSL import Context, TLSv1_METHOD, VERIFY_PEER,\
VERIFY_FAIL_IF_NO_PEER_CERT, OP_NO_SSLv2
@@ -9,6 +10,7 @@
from twisted.web.client import getPage
from twisted.python.failure import Failure
from twisted.internet import reactor
+from twisted.python import log
from buildbot.steps.transfer import StringDownload
@@ -52,6 +54,7 @@ def __init__(self, servers, server_cert, duration=2*3600, attempts=5,
self.addFactoryArguments(servers=servers, server_cert=server_cert,
duration=duration)
self.servers = list(servers)
+ shuffle(self.servers)
self.server_cert = server_cert
self.duration = duration
self.attempts = attempts
@@ -106,10 +109,7 @@ def start(self):
URLPath(self.uri).netloc, self.server_cert)
d = getPage(self.uri, method=method, headers=headers,
postdata=urlencode(postdata), contextFactory=contextFactory)
- d.addCallbacks(
- self.downloadSignature,
- lambda e: reactor.callLater(self.sleeptime, self.start)
- )
+ d.addCallbacks(self.downloadSignature, self.requestFailed)
def downloadSignature(self, res):
self.s = res
@@ -119,3 +119,11 @@ def interrupt(self, reason='Interrupted'):
if not self.interrupted:
self.interrupted = True
StringDownload.interrupt(self, 'Interrupted')
+
+ def requestFailed(self, err):
+ msg = "%s: token generation failed, error message: %s" \
+ % (self, err.getErrorMessage())
+ log.msg(msg)
+ if self.stdio_log:
+ self.stdio_log.addStdout('%s\n' % msg)
+ reactor.callLater(self.sleeptime, self.start)
View
@@ -753,7 +753,7 @@ def __init__(self, platform, symbols_path=None, **kwargs):
"python -u xpcshell/runxpcshelltests.py"])
if symbols_path:
- script += " --symbols-path=../%s" % symbols_path
+ script += " --symbols-path=%s" % symbols_path
script += " --manifest=xpcshell/tests/all-test-dirs.list %(exedir)s/xpcshell" + bin_extension
self.command = ['bash', '-c', WithProperties(script)]
@@ -814,7 +814,7 @@ def __init__(self, variant='plain', symbols_path=None, leakThreshold=None,
self.command.append("--test-path=%s" % testPath)
if symbols_path:
- self.command.append(WithProperties("--symbols-path=../%s" % symbols_path))
+ self.command.append(WithProperties("--symbols-path=%s" % symbols_path))
if leakThreshold:
self.command.append('--leak-threshold=%d' % leakThreshold)
@@ -839,7 +839,7 @@ def __init__(self, suite, symbols_path=None, leakThreshold=None,
'--extra-profile-file=bin/plugins',
]
if symbols_path:
- self.command.append(WithProperties("--symbols-path=../%s" % symbols_path))
+ self.command.append(WithProperties("--symbols-path=%s" % symbols_path))
if leakThreshold:
self.command.append('--leak-threshold=%d' % leakThreshold)
self.command.extend(self.getSuiteOptions(suite))

0 comments on commit eb3e9ea

Please sign in to comment.