Skip to content

Commit 9cc13c8

Browse files
committed
update parameters validation
- parameter to allow spaces - catch exceptions from getListOfAutomaticBuilders()
1 parent 87eae71 commit 9cc13c8

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

context.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,12 @@ def validateParameter(self, name, value):
5959
raise ValueError('Parameter "%s"="%s": %s' % (name, value, re.sub('^Parameter ', '', str(e))))
6060
return value
6161

62-
def extractParameterEx(self, desc, nameFilter, validationFn=None):
62+
def extractParameterEx(self, desc, nameFilter, validationFn=None, allowSpaces=False):
6363
if not desc:
6464
return None
6565
if re.search(nameFilter + r'=', desc):
66-
m = re.search(r'(^|`|\n|\r)(?P<name>' + nameFilter + r')=(?P<value>[^\r\n\t\s`]*)(\r|\n|`|$)', desc)
66+
forbidSpaces = '' if allowSpaces else r'\s'
67+
m = re.search(r'(^|`|\n|\r)(?P<name>' + nameFilter + r')=(?P<value>[^\r\n\t' + forbidSpaces + '`]*)(\r|\n|`|$)', desc)
6768
if m:
6869
name = m.group('name')
6970
value = m.group('value')

serviceloops.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,11 @@ def queueBuildersForPR(self, prid, head_sha, head_sha_old):
135135

136136
active_builders = yield db.bcc.getActiveBuilders()
137137
pr = yield db.prcc.getPullRequest(prid);
138-
queueBuilders = self.context.getListOfAutomaticBuilders(pr)
138+
try:
139+
queueBuilders = self.context.getListOfAutomaticBuilders(pr)
140+
except:
141+
log.err()
142+
queueBuilders = []
139143
testFilter = self.context.extractRegressionTestFilter(pr.description)
140144
for b in active_builders:
141145
bid = b.bid

0 commit comments

Comments
 (0)