Differential D68

T120 - Added TAP headers to CheckDetail TAP export
ClosedPublic
Actions

Authored by tflink on Apr 23 2014, 12:16 PM.

Details

Reviewers
kparal
jskladan
Maniphest Tasks
T141: synchronize TAP output from CheckDetail with TAP13 parser
T120: Move the TAP/bayeux workarounds to check.py
Summary

CheckDetail's export_TAP now adds the proper TAPv13 headers.

Test Plan

Tests changed accordingly

Diff Detail

Branch
feature/T120
Lint
No Linters Available
Unit
No Unit Test Coverage
tflink requested changes to this revision.Apr 23 2014, 1:36 PM

overall, it looks OK to me. Just a couple of small concerns

libtaskotron/check.py
315

Can you expand this a bit more to make it more readable? Maybe initialize tapout as ['TAP version 13', '1..%d' % len(check_details)]? I just find this line a bit difficult to parse. If I'm missing something and there's no reasonable way to make the header addition more clear, adding a comment explaining why those two lines are being added would be acceptable

testing/test_check.py
202

This is more of a general concern I hit elsewhere in the code. I'd like to see all variables named tap renamed - it causes confusion with the bayeux module.

Yes, I can figure out that this is not the tap module pretty quickly but it still takes longer to parse than it should and could lead to confusion

tflink commandeered this revision.Apr 24 2014, 2:51 PM
tflink edited reviewers, added: jskladan; removed: tflink.

I need this to keep working on reporting, so I'm commandeering the revision

tflink updated this revision.Apr 24 2014, 2:54 PM
  • cleaned up TAP headers to be a bit more readable
  • changed incidences of tap to something else to reduce potential confusion with tap module
tflink updated this revision.Apr 24 2014, 4:53 PM
  • changing resultsdb directive code to create and complete resultsdb job during the reporting process
tflink updated this revision.Apr 24 2014, 5:08 PM
attempting to undo the last review change that went to the wrong review
tflink added a comment.Apr 24 2014, 5:09 PM

Sorry for the noise, when I tried to create a review for D70 the diff ended up going to this review instead

kparal accepted this revision.Apr 24 2014, 6:23 PM

Please adjust the docstrings and ship it.

libtaskotron/check.py
246–257

Please adjust the example - prepend it with:

TAP version 13
1..1
testing/test_check.py
306–310

Please adjust the example - prepend it with:

TAP version 13
1..1
tflink added a comment.Apr 24 2014, 6:27 PM

Please adjust the docstrings and ship it.

Good catch. Thanks

tflink closed this revision.Apr 24 2014, 6:40 PM

I botched the push a little bit and phabricator isn't autoclosing the review as resolved. This was resolved with rLTRNff41db8250e6

Revision Contents

Diff 191

View Options

libtaskotron/check.py

Show First 20 Lines • Show All 237 Lines • ▼ Show 20 Line(s)235def export_TAP(*check_details):
238 @param *check_details any number of CheckDetail instances 238​ @param *check_details any number of CheckDetail instances
239 @return a string containing TAP output with results for every CheckDetail 239​ @return a string containing TAP output with results for every CheckDetail
240 instance provided 240​ instance provided
241 @raise TaskotronValueError if CheckDetail.item is empty for any parameter 241​ @raise TaskotronValueError if CheckDetail.item is empty for any parameter
242 provided 242​ provided
243 243​
244 Example output: 244​ Example output:
245 ~~~~~~~~~~~~~~~~~~~~~~~ 245​ ~~~~~~~~~~~~~~~~~~~~~~~
246 ok - $CHECKNAME for Koji build xchat-0.5-1.fc20 246​ ok - $CHECKNAME for Koji build xchat-0.5-1.fc20
247 --- 247​ ---
248 details: 248​ details:
249 output: |- 249​ output: |-
250 xchat.x86_64: W: file-not-utf8 /usr/share/doc/xchat/ChangeLog 250​ xchat.x86_64: W: file-not-utf8 /usr/share/doc/xchat/ChangeLog
251 xchat.x86_64: W: non-conffile-in-etc /etc/gconf/schemas/apps.schemas 251​ xchat.x86_64: W: non-conffile-in-etc /etc/gconf/schemas/apps.schemas
252 xchat.x86_64: W: no-manual-page-for-binary xchat 252​ xchat.x86_64: W: no-manual-page-for-binary xchat
253 item: xchat-0.5-1.fc20 253​ item: xchat-0.5-1.fc20
254 outcome: PASSED 254​ outcome: PASSED
255 summary: 5 ERRORS, 10 WARNINGS 255​ summary: 5 ERRORS, 10 WARNINGS
256 type: koji_build 256​ type: koji_build
257 ... 257​ ...
kparalUnsubmitted
Not Done

Please adjust the example - prepend it with:

TAP version 13
1..1
258 ~~~~~~~~~~~~~~~~~~~~~~~ 258​ ~~~~~~~~~~~~~~~~~~~~~~~
259 ''' 259​ '''
260 260​
261 # validate input 261​ # validate input
262 for detail in check_details: 262​ for detail in check_details:
263 if not detail.item: 263​ if not detail.item:
264 raise exc.TaskotronValueError('CheckDetail.item is empty for: %s' % 264​ raise exc.TaskotronValueError('CheckDetail.item is empty for: %s' %
265 detail) 265​ detail)
266 266​
267 # TAP test line will be more readable for recognized report types 267​ # TAP test line will be more readable for recognized report types
268 pretty_type_name = { 268​ pretty_type_name = {
269 ReportType.KOJI_BUILD: 'Koji build', 269​ ReportType.KOJI_BUILD: 'Koji build',
270 ReportType.BODHI_UPDATE: 'Bodhi update', 270​ ReportType.BODHI_UPDATE: 'Bodhi update',
271 ReportType.YUM_REPOSITORY: 'Yum repository', 271​ ReportType.YUM_REPOSITORY: 'Yum repository',
272 } 272​ }
273 273​
274 tapgen = tap.TAPGenerator() 274​ tapgen = tap.TAPGenerator()
275 tapout = [] 275​ tapout = ['TAP version 13', '1..%d' % len(check_details)]
276 276​
277 for detail in check_details: 277​ for detail in check_details:
278 # TAP test line 278​ # TAP test line
279 tap_outcome = tap.FAIL 279​ tap_outcome = tap.FAIL
280 if detail.outcome in ['PASSED', 'INFO']: 280​ if detail.outcome in ['PASSED', 'INFO']:
281 tap_outcome = tap.PASS 281​ tap_outcome = tap.PASS
282 282​
283 name = '$CHECKNAME for ' 283​ name = '$CHECKNAME for '
Show All 23 Lines304 if key in RESERVED_KEYS:
307 continue 307​ continue
308 308​
309 data[key] = value 309​ data[key] = value
310 310​
311 # generate 311​ # generate
312 output = tapgen.format_TAP_msg(result=tap_outcome, name=name, data=data) 312​ output = tapgen.format_TAP_msg(result=tap_outcome, name=name, data=data)
313 tapout.append(output) 313​ tapout.append(output)
314 314​
315 return '\n'.join(tapout) 315​ return '\n'.join(tapout)
tflinkAuthorUnsubmitted
Not Done

Can you expand this a bit more to make it more readable? Maybe initialize tapout as ['TAP version 13', '1..%d' % len(check_details)]? I just find this line a bit difficult to parse. If I'm missing something and there's no reasonable way to make the header addition more clear, adding a comment explaining why those two lines are being added would be acceptable

316 316​
317def import_TAP(source): 317​def import_TAP(source):
318 '''Parses the source (string in TAP format), and returns list of 318​ '''Parses the source (string in TAP format), and returns list of
319 CheckDetails. 319​ CheckDetails.
320 @throw TaskotronValueError if TAP syntax is incorrect 320​ @throw TaskotronValueError if TAP syntax is incorrect
321 ''' 321​ '''
322 322​
323 tap = TAP13() 323​ tap = TAP13()
Show All 27 Lines
View Options

testing/test_check.py

Show First 20 Lines • Show All 191 Lines • ▼ Show 20 Line(s)190xchat.x86_64: W: no-manual-page-for-binary xchat'''
192 192​
193 def setup_method(self, method): 193​ def setup_method(self, method):
194 self.cd = check.CheckDetail(item=self.item, outcome=self.outcome, 194​ self.cd = check.CheckDetail(item=self.item, outcome=self.outcome,
195 summary=self.summary, 195​ summary=self.summary,
196 report_type=self.report_type, 196​ report_type=self.report_type,
197 keyvals = self.keyvals) 197​ keyvals = self.keyvals)
198 self.cd.output.append(self.output) 198​ self.cd.output.append(self.output)
199 199​
200 def _tap_to_yaml(self, tap): 200​ def _tap_to_yaml(self, rendered_tap):
201 '''Remove all TAP-related contents and return only its YAML block(s)''' 201​ '''Remove all TAP-related contents and return only its YAML block(s)'''
202 lines = tap.splitlines() 202​ lines = rendered_tap.splitlines()[2:]
tflinkAuthorUnsubmitted
Not Done

This is more of a general concern I hit elsewhere in the code. I'd like to see all variables named tap renamed - it causes confusion with the bayeux module.

Yes, I can figure out that this is not the tap module pretty quickly but it still takes longer to parse than it should and could lead to confusion

203 203​
204 # split the output to TAP result lines and YAML blocks 204​ # split the output to TAP result lines and YAML blocks
205 tap_lines = [line for line in lines if line.startswith('ok') or 205​ tap_lines = [line for line in lines if line.startswith('ok') or
206 line.startswith('not ok')] 206​ line.startswith('not ok')]
207 # remove left padding - 2 spaces 207​ # remove left padding - 2 spaces
208 yaml_lines = [line[2:] for line in lines if line not in tap_lines] 208​ yaml_lines = [line[2:] for line in lines if line not in tap_lines]
209 209​
210 return '\n'.join(yaml_lines) 210​ return '\n'.join(yaml_lines)
211 211​
212 def test_single_tap(self): 212​ def test_single_tap(self):
213 '''Test export with a single item section. Check generic TAP lines.''' 213​ '''Test export with a single item section. Check generic TAP lines.'''
214 tap = check.export_TAP(self.cd) 214​ tap_output = check.export_TAP(self.cd)
215 lines = tap.splitlines() 215​ lines = tap_output.splitlines()
216 216​
217 # generic lines must exist 217​ # generic lines must exist
218 assert lines[0].startswith('ok ') 218​ assert lines[0].startswith('TAP version 13')
219 assert lines[1].strip() == '---' 219​ assert lines[1].startswith('1..')
220​ assert lines[2].startswith('ok ')
221​ assert lines[3].strip() == '---'
220 assert lines[-1].strip() == '...' 222​ assert lines[-1].strip() == '...'
221 223​
222 def test_single_yaml(self): 224​ def test_single_yaml(self):
223 '''Test export with a single item section. Check specific YAML lines.''' 225​ '''Test export with a single item section. Check specific YAML lines.'''
224 tap = check.export_TAP(self.cd) 226​ tap_output = check.export_TAP(self.cd)
225 227​
226 # specific lines must exist 228​ # specific lines must exist
227 yaml_block = self._tap_to_yaml(tap) 229​ yaml_block = self._tap_to_yaml(tap_output)
228 yaml_obj = yaml.safe_load(yaml_block) 230​ yaml_obj = yaml.safe_load(yaml_block)
229 231​
230 assert yaml_obj['item'] == self.item 232​ assert yaml_obj['item'] == self.item
231 assert yaml_obj['outcome'] == self.outcome 233​ assert yaml_obj['outcome'] == self.outcome
232 assert yaml_obj['summary'] == self.summary 234​ assert yaml_obj['summary'] == self.summary
233 assert yaml_obj['type'] == self.report_type 235​ assert yaml_obj['type'] == self.report_type
234 assert yaml_obj['details'] 236​ assert yaml_obj['details']
235 assert yaml_obj['details']['output'] == self.output 237​ assert yaml_obj['details']['output'] == self.output
236 assert yaml_obj['foo'] == self.keyvals['foo'] 238​ assert yaml_obj['foo'] == self.keyvals['foo']
237 assert yaml_obj['moo'] == self.keyvals['moo'] 239​ assert yaml_obj['moo'] == self.keyvals['moo']
238 240​
239 def test_invalid_keyvals(self): 241​ def test_invalid_keyvals(self):
240 '''Test export with keyvals containing reserved keys.''' 242​ '''Test export with keyvals containing reserved keys.'''
241 cd = deepcopy(self.cd) 243​ cd = deepcopy(self.cd)
242 244​
243 for key in check.RESERVED_KEYS: 245​ for key in check.RESERVED_KEYS:
244 cd.keyvals[key] = 'foo' 246​ cd.keyvals[key] = 'foo'
245 247​
246 tap = check.export_TAP(cd) 248​ tap_output = check.export_TAP(cd)
247 249​
248 # specific lines must exist 250​ # specific lines must exist
249 yaml_block = self._tap_to_yaml(tap) 251​ yaml_block = self._tap_to_yaml(tap_output)
250 yaml_obj = yaml.load(yaml_block) 252​ yaml_obj = yaml.load(yaml_block)
251 253​
252 assert yaml_obj['item'] == self.item 254​ assert yaml_obj['item'] == self.item
253 assert yaml_obj['outcome'] == self.outcome 255​ assert yaml_obj['outcome'] == self.outcome
254 assert yaml_obj['summary'] == self.summary 256​ assert yaml_obj['summary'] == self.summary
255 assert yaml_obj['type'] == self.report_type 257​ assert yaml_obj['type'] == self.report_type
256 assert yaml_obj['details'] 258​ assert yaml_obj['details']
257 assert yaml_obj['details']['output'] == self.output 259​ assert yaml_obj['details']['output'] == self.output
258 assert yaml_obj['foo'] == self.keyvals['foo'] 260​ assert yaml_obj['foo'] == self.keyvals['foo']
259 assert yaml_obj['moo'] == self.keyvals['moo'] 261​ assert yaml_obj['moo'] == self.keyvals['moo']
260 262​
261 def test_multi(self): 263​ def test_multi(self):
262 '''Test export with multiple item sections''' 264​ '''Test export with multiple item sections'''
263 cd2 = check.CheckDetail(item='foobar-1.2-3.fc20', outcome='FAILED', 265​ cd2 = check.CheckDetail(item='foobar-1.2-3.fc20', outcome='FAILED',
264 summary='dependency error', 266​ summary='dependency error',
265 report_type=check.ReportType.BODHI_UPDATE) 267​ report_type=check.ReportType.BODHI_UPDATE)
266 cd3 = check.CheckDetail(item='f20-updates', outcome='INFO', 268​ cd3 = check.CheckDetail(item='f20-updates', outcome='INFO',
267 summary='2 stale updates', 269​ summary='2 stale updates',
268 report_type=check.ReportType.YUM_REPOSITORY) 270​ report_type=check.ReportType.YUM_REPOSITORY)
269 tap = check.export_TAP(self.cd, cd2, cd3) 271​ tap_output = check.export_TAP(self.cd, cd2, cd3)
270 lines = tap.splitlines() 272​ lines = tap_output.splitlines()
271 yaml_blocks = self._tap_to_yaml(tap) 273​
274​ assert lines[1].strip() == '1..3'
275​
276​ yaml_blocks = self._tap_to_yaml(tap_output)
272 277​
273 # test that we have a correct number of TAP lines 278​ # test that we have a correct number of TAP lines
274 tap_lines = [line for line in lines if line.startswith('ok') or 279​ tap_lines = [line for line in lines if line.startswith('ok') or
275 line.startswith('not ok')] 280​ line.startswith('not ok')]
276 assert len(tap_lines) == 3 281​ assert len(tap_lines) == 3
277 282​
278 # test that we have a correct number (and rough contents) of YAML blocks 283​ # test that we have a correct number (and rough contents) of YAML blocks
279 yaml_gen = yaml.safe_load_all(yaml_blocks) 284​ yaml_gen = yaml.safe_load_all(yaml_blocks)
280 for index, yaml_obj in enumerate(yaml_gen): 285​ for index, yaml_obj in enumerate(yaml_gen):
281 assert 'item' in yaml_obj 286​ assert 'item' in yaml_obj
282 assert index == 2 287​ assert index == 2
283 288​
284 def test_invalid(self): 289​ def test_invalid(self):
285 '''Test invalid input parameters''' 290​ '''Test invalid input parameters'''
286 with pytest.raises(exc.TaskotronValueError): 291​ with pytest.raises(exc.TaskotronValueError):
287 self.cd.item = None 292​ self.cd.item = None
288 check.export_TAP(self.cd) 293​ check.export_TAP(self.cd)
289 294​
290 def test_minimal(self): 295​ def test_minimal(self):
291 '''Test that empty CheckDetail values don't produce empty TAP lines, 296​ '''Test that empty CheckDetail values don't produce empty TAP lines,
292 for example 'summary:' should not be present if there's no 297​ for example 'summary:' should not be present if there's no
293 CheckDetail.summary''' 298​ CheckDetail.summary'''
294 cd = check.CheckDetail('foo') 299​ cd = check.CheckDetail('foo')
295 tap = check.export_TAP(cd) 300​ tap_output = check.export_TAP(cd)
296 yaml_block = self._tap_to_yaml(tap) 301​ yaml_block = self._tap_to_yaml(tap_output)
297 yaml_obj = yaml.safe_load(yaml_block) 302​ yaml_obj = yaml.safe_load(yaml_block)
298 303​
299 # the output should look like this: 304​ # the output should look like this:
300 # 305​ #
301 # ok - $CHECKNAME for XXX 306​ # ok - $CHECKNAME for XXX
302 # --- 307​ # ---
303 # item: XXX 308​ # item: XXX
304 # outcome: XXX 309​ # outcome: XXX
305 # ... 310​ # ...
kparalUnsubmitted
Not Done

Please adjust the example - prepend it with:

TAP version 13
1..1
306 # 311​ #
307 # ('outcome:' is technically not a mandatory line, but with CheckDetail 312​ # ('outcome:' is technically not a mandatory line, but with CheckDetail
308 # export we produce it every time) 313​ # export we produce it every time)
309 assert len(yaml_obj) == 2 314​ assert len(yaml_obj) == 2
310 315​
311 def test_tap_ok(self): 316​ def test_tap_ok(self):
312 '''Test that TAP header contains 'ok' for appropriate outcomes''' 317​ '''Test that TAP header contains 'ok' for appropriate outcomes'''
313 # by default the outcome is PASSED 318​ # by default the outcome is PASSED
314 assert check.export_TAP(self.cd).startswith('ok') 319​ assert check.export_TAP(self.cd).splitlines()[2].startswith('ok')
315 self.cd.outcome = 'INFO' 320​ self.cd.outcome = 'INFO'
316 assert check.export_TAP(self.cd).startswith('ok') 321​ assert check.export_TAP(self.cd).splitlines()[2].startswith('ok')
317 322​
318 def test_tap_not_ok(self): 323​ def test_tap_not_ok(self):
319 '''Test that TAP header contains 'not ok' for appropriate outcomes''' 324​ '''Test that TAP header contains 'not ok' for appropriate outcomes'''
320 self.cd.outcome = 'FAILED' 325​ self.cd.outcome = 'FAILED'
321 assert check.export_TAP(self.cd).startswith('not ok') 326​ assert check.export_TAP(self.cd).splitlines()[2].startswith('not ok')
322 self.cd.outcome = 'NEEDS_INSPECTION' 327​ self.cd.outcome = 'NEEDS_INSPECTION'
323 assert check.export_TAP(self.cd).startswith('not ok') 328​ assert check.export_TAP(self.cd).splitlines()[2].startswith('not ok')
324 self.cd.outcome = 'ABORTED' 329​ self.cd.outcome = 'ABORTED'
325 assert check.export_TAP(self.cd).startswith('not ok') 330​ assert check.export_TAP(self.cd).splitlines()[2].startswith('not ok')
326 self.cd.outcome = 'CRASHED' 331​ self.cd.outcome = 'CRASHED'
327 assert check.export_TAP(self.cd).startswith('not ok') 332​ assert check.export_TAP(self.cd).splitlines()[2].startswith('not ok')
328 333​
329 def test_custom_report_type(self): 334​ def test_custom_report_type(self):
330 '''Test that user can specify a custom CheckDetail.report_type''' 335​ '''Test that user can specify a custom CheckDetail.report_type'''
331 self.cd.report_type = 'My Custom Type' 336​ self.cd.report_type = 'My Custom Type'
332 tap = check.export_TAP(self.cd) 337​ tap_output = check.export_TAP(self.cd)
333 yaml_block = self._tap_to_yaml(tap) 338​ yaml_block = self._tap_to_yaml(tap_output)
334 yaml_obj = yaml.safe_load(yaml_block) 339​ yaml_obj = yaml.safe_load(yaml_block)
335 340​
336 assert yaml_obj['type'] == self.cd.report_type 341​ assert yaml_obj['type'] == self.cd.report_type
337 342​
338 343​
339class TestImportTAP(object): 344​class TestImportTAP(object):
340 '''Test @method import_TAP''' 345​ '''Test @method import_TAP'''
341 item = 'xchat-0.5-1.fc20' 346​ item = 'xchat-0.5-1.fc20'
342 outcome = 'PASSED' 347​ outcome = 'PASSED'
343 summary='5 ERRORS, 10 WARNINGS' 348​ summary='5 ERRORS, 10 WARNINGS'
344 report_type=check.ReportType.KOJI_BUILD 349​ report_type=check.ReportType.KOJI_BUILD
345 output = '''\ 350​ output = '''\
346xchat.x86_64: W: file-not-utf8 /usr/share/doc/xchat/ChangeLog 351​xchat.x86_64: W: file-not-utf8 /usr/share/doc/xchat/ChangeLog
347xchat.x86_64: W: non-conffile-in-etc /etc/gconf/schemas/apps_xchat_url_handler.schemas 352​xchat.x86_64: W: non-conffile-in-etc /etc/gconf/schemas/apps_xchat_url_handler.schemas
348xchat.x86_64: W: no-manual-page-for-binary xchat''' 353​xchat.x86_64: W: no-manual-page-for-binary xchat'''
349 keyvals = {"foo": "bar", "moo": 11} 354​ keyvals = {"foo": "bar", "moo": 11}
350 355​
351 tap = """ 356​ tap_output = """
352TAP version 13 357​TAP version 13
3531..1 358​1..1
354ok - $CHECKNAME for Koji build xchat-0.5-1.fc20 359​ok - $CHECKNAME for Koji build xchat-0.5-1.fc20
355 --- 360​ ---
356 details: 361​ details:
357 output: |- 362​ output: |-
358 xchat.x86_64: W: file-not-utf8 /usr/share/doc/xchat/ChangeLog 363​ xchat.x86_64: W: file-not-utf8 /usr/share/doc/xchat/ChangeLog
359 xchat.x86_64: W: non-conffile-in-etc /etc/gconf/schemas/apps_xchat_url_handler.schemas 364​ xchat.x86_64: W: non-conffile-in-etc /etc/gconf/schemas/apps_xchat_url_handler.schemas
Show All 9 Lines
369 def setup_method(self, method): 374​ def setup_method(self, method):
370 self.cd = check.CheckDetail(item=self.item, outcome=self.outcome, 375​ self.cd = check.CheckDetail(item=self.item, outcome=self.outcome,
371 summary=self.summary, 376​ summary=self.summary,
372 report_type=self.report_type, 377​ report_type=self.report_type,
373 keyvals=self.keyvals) 378​ keyvals=self.keyvals)
374 self.cd.output.append(self.output) 379​ self.cd.output.append(self.output)
375 380​
376 def test_import(self): 381​ def test_import(self):
377 cds = check.import_TAP(self.tap) 382​ cds = check.import_TAP(self.tap_output)
378 383​
379 assert len(cds) == 1 384​ assert len(cds) == 1
380 assert isinstance(cds[0], check.CheckDetail) 385​ assert isinstance(cds[0], check.CheckDetail)
381 386​
382 cd = cds[0] 387​ cd = cds[0]
383 assert cd.item == self.cd.item 388​ assert cd.item == self.cd.item
384 assert cd.outcome == self.cd.outcome 389​ assert cd.outcome == self.cd.outcome
385 assert cd.summary == self.cd.summary 390​ assert cd.summary == self.cd.summary
386 assert cd.report_type == self.cd.report_type 391​ assert cd.report_type == self.cd.report_type
387 assert cd.output == self.cd.output 392​ assert cd.output == self.cd.output
388 assert cd.keyvals == self.keyvals 393​ assert cd.keyvals == self.keyvals
389 394​
390 def test_import_exported(self): 395​ def test_import_exported(self):
391 tap = check.export_TAP(self.cd) 396​ tap_output = check.export_TAP(self.cd)
392 ​
393 #TODO: remove this ugly hack - it is here because of the bug in bayeux ​
394 tap = "TAP version 13\n1..1\n%s" % tap ​
395 397​
396 cds = check.import_TAP(self.tap) 398​ cds = check.import_TAP(tap_output)
397 399​
398 assert len(cds) == 1 400​ assert len(cds) == 1
399 assert isinstance(cds[0], check.CheckDetail) 401​ assert isinstance(cds[0], check.CheckDetail)
400 402​
401 cd = cds[0] 403​ cd = cds[0]
402 assert cd.item == self.cd.item 404​ assert cd.item == self.cd.item
403 assert cd.outcome == self.cd.outcome 405​ assert cd.outcome == self.cd.outcome
404 assert cd.summary == self.cd.summary 406​ assert cd.summary == self.cd.summary
405 assert cd.report_type == self.cd.report_type 407​ assert cd.report_type == self.cd.report_type
406 assert cd.output == self.cd.output 408​ assert cd.output == self.cd.output
407 assert cd.keyvals == self.keyvals 409​ assert cd.keyvals == self.keyvals
408 410​
409 411​
410 def test_invalid_tap(self): 412​ def test_invalid_tap(self):
411 tap = """ 413​ tap_output = """
412TAP version 13 414​TAP version 13
413ok 2 foo 415​ok 2 foo
414ok 1 bar""" 416​ok 1 bar"""
415 with pytest.raises(exc.TaskotronValueError): 417​ with pytest.raises(exc.TaskotronValueError):
416 check.import_TAP(tap) 418​ check.import_TAP(tap_output)
417 419​
View Options

testing/test_resultsdb_directive.py

Show All 20 Lines19 self.cd = check.CheckDetail(
21 report_type = check.ReportType.KOJI_BUILD, 21​ report_type = check.ReportType.KOJI_BUILD,
22 outcome = 'NEEDS_INSPECTION', 22​ outcome = 'NEEDS_INSPECTION',
23 summary = 'foo_bar summary', 23​ summary = 'foo_bar summary',
24 output = ["foo\nbar"], 24​ output = ["foo\nbar"],
25 keyvals = {"foo": "moo1", "bar": "moo2"}, 25​ keyvals = {"foo": "moo1", "bar": "moo2"},
26 ) 26​ )
27 27​
28 28​
29 #TODO: remove this ugly hack - it is here because of the bug in bayeux 29​ tap = check.export_TAP(self.cd)
30 tap = "TAP version 13\n1..1\n%s" % check.export_TAP(self.cd) ​
31 30​
32 self.ref_input = {'results': tap} 31​ self.ref_input = {'results': tap}
33 self.ref_envdata = { 32​ self.ref_envdata = {
34 'resultsdb_job_id': 1, 33​ 'resultsdb_job_id': 1,
35 'checkname': 'test_resultsdb_report', 34​ 'checkname': 'test_resultsdb_report',
36 } 35​ }
37 36​
38 Config = config.get_config() 37​ Config = config.get_config()
▲ Show 20 Lines • Show All 81 Lines • Show Last 20 Lines