equal
deleted
inserted
replaced
196 return self.__calls |
196 return self.__calls |
197 |
197 |
198 def isError(self, aLine): |
198 def isError(self, aLine): |
199 """Convenience matcher for basic errors. |
199 """Convenience matcher for basic errors. |
200 Override in sub-classes to specialise.""" |
200 Override in sub-classes to specialise.""" |
201 return True if Recipe.error.match(aLine) else False |
201 if Recipe.error.match(aLine): |
|
202 return True |
|
203 return False |
202 |
204 |
203 def isWarning(self, aLine): |
205 def isWarning(self, aLine): |
204 """Convenience matcher for basic warnings. |
206 """Convenience matcher for basic warnings. |
205 Override in sub-classes to specialise.""" |
207 Override in sub-classes to specialise.""" |
206 return True if Recipe.warning.match(aLine) else False |
208 if Recipe.warning.match(aLine): |
|
209 return True |
|
210 return False |
207 |
211 |
208 def getOutput(self): |
212 def getOutput(self): |
209 """"Return a list of all output that isn't an error or a warning. |
213 """"Return a list of all output that isn't an error or a warning. |
210 Override in sub-classes to specialise.""" |
214 Override in sub-classes to specialise.""" |
211 output = [] |
215 output = [] |
232 warnings.append(line) |
236 warnings.append(line) |
233 return warnings |
237 return warnings |
234 |
238 |
235 def isSuccess(self): |
239 def isSuccess(self): |
236 "Convenience method to get overall recipe status." |
240 "Convenience method to get overall recipe status." |
237 return True if self.getDetail(Recipe.exit) == "ok" else False |
241 return (self.getDetail(Recipe.exit) == "ok") |
238 |
242 |
239 |
243 |
240 class Win32Recipe(Recipe): |
244 class Win32Recipe(Recipe): |
241 "Win32 tailored recipe class." |
245 "Win32 tailored recipe class." |
242 def isError(self, aLine): |
246 def isError(self, aLine): |
243 return True if mwError.match(aLine) else False |
247 if mwError.match(aLine): |
|
248 return True |
|
249 return False |
244 |
250 |
245 def isWarning(self, aLine): |
251 def isWarning(self, aLine): |
246 return True if mwWarning.match(aLine) else False |
252 if mwWarning.match(aLine): |
247 |
253 return True |
248 |
254 return False |
249 |
|