@@ -216,22 +216,22 @@ def foo():
216
216
""" ))
217
217
218
218
env .write_config (ignore = 'D100' )
219
- _ , err , code = env .invoke ()
219
+ out , err , code = env .invoke ()
220
220
assert code == 1
221
- assert 'D100' not in err
222
- assert 'D103' in err
221
+ assert 'D100' not in out
222
+ assert 'D103' in out
223
223
224
224
env .write_config (ignore = '' )
225
- _ , err , code = env .invoke ()
225
+ out , err , code = env .invoke ()
226
226
assert code == 1
227
- assert 'D100' in err
228
- assert 'D103' in err
227
+ assert 'D100' in out
228
+ assert 'D103' in out
229
229
230
230
env .write_config (ignore = 'D100,D103' )
231
- _ , err , code = env .invoke ()
231
+ out , err , code = env .invoke ()
232
232
assert code == 0
233
- assert 'D100' not in err
234
- assert 'D103' not in err
233
+ assert 'D100' not in out
234
+ assert 'D103' not in out
235
235
236
236
237
237
def test_verbose (env ):
@@ -259,6 +259,9 @@ def foo():
259
259
out , err , code = env .invoke (args = '--count' )
260
260
assert code == 1
261
261
assert '2' in out
262
+ # The error count should be in the last line of the output.
263
+ # -2 since there is a newline at the end of the output.
264
+ assert '2' == out .split ('\n ' )[- 2 ].strip ()
262
265
263
266
264
267
def test_select_cli (env ):
@@ -269,10 +272,10 @@ def foo():
269
272
pass
270
273
""" ))
271
274
272
- _ , err , code = env .invoke (args = "--select=D100" )
275
+ out , err , code = env .invoke (args = "--select=D100" )
273
276
assert code == 1
274
- assert 'D100' in err
275
- assert 'D103' not in err
277
+ assert 'D100' in out
278
+ assert 'D103' not in out
276
279
277
280
278
281
def test_select_config (env ):
@@ -284,10 +287,10 @@ def foo():
284
287
""" ))
285
288
286
289
env .write_config (select = "D100" )
287
- _ , err , code = env .invoke ()
290
+ out , err , code = env .invoke ()
288
291
assert code == 1
289
- assert 'D100' in err
290
- assert 'D103' not in err
292
+ assert 'D100' in out
293
+ assert 'D103' not in out
291
294
292
295
293
296
def test_add_select_cli (env ):
@@ -300,11 +303,11 @@ def foo():
300
303
""" ))
301
304
302
305
env .write_config (select = "D100" )
303
- _ , err , code = env .invoke (args = "--add-select=D101" )
306
+ out , err , code = env .invoke (args = "--add-select=D101" )
304
307
assert code == 1
305
- assert 'D100' in err
306
- assert 'D101' in err
307
- assert 'D103' not in err
308
+ assert 'D100' in out
309
+ assert 'D101' in out
310
+ assert 'D103' not in out
308
311
309
312
310
313
def test_add_ignore_cli (env ):
@@ -317,11 +320,11 @@ def foo():
317
320
""" ))
318
321
319
322
env .write_config (select = "D100,D101" )
320
- _ , err , code = env .invoke (args = "--add-ignore=D101" )
323
+ out , err , code = env .invoke (args = "--add-ignore=D101" )
321
324
assert code == 1
322
- assert 'D100' in err
323
- assert 'D101' not in err
324
- assert 'D103' not in err
325
+ assert 'D100' in out
326
+ assert 'D101' not in out
327
+ assert 'D103' not in out
325
328
326
329
327
330
def test_conflicting_select_ignore_config (env ):
@@ -368,21 +371,21 @@ def foo():
368
371
env .write_config (ignore = 'D100' , verbose = True )
369
372
out , err , code = env .invoke ()
370
373
assert code == 0
371
- assert 'D301' not in err
372
- assert 'D302' not in err
374
+ assert 'D301' not in out
375
+ assert 'D302' not in out
373
376
374
377
375
378
def test_missing_docstring_in_package (env ):
376
379
with env .open ('__init__.py' , 'wt' ) as init :
377
380
pass # an empty package file
378
381
out , err , code = env .invoke ()
379
382
assert code == 1
380
- assert 'D100' not in err # shouldn't be treated as a module
381
- assert 'D104' in err # missing docstring in package
383
+ assert 'D100' not in out # shouldn't be treated as a module
384
+ assert 'D104' in out # missing docstring in package
382
385
383
386
384
387
def test_illegal_convention (env ):
385
- out , err , code = env .invoke ('--convention=illegal_conv' )
388
+ _ , err , code = env .invoke ('--convention=illegal_conv' )
386
389
assert code == 2 , err
387
390
assert "Illegal convention 'illegal_conv'." in err
388
391
assert 'Possible conventions: pep257' in err
@@ -422,11 +425,11 @@ def foo():
422
425
""" ))
423
426
424
427
env .write_config (select = "" )
425
- _ , err , code = env .invoke (args = "--add-select=D100" )
428
+ out , err , code = env .invoke (args = "--add-select=D100" )
426
429
assert code == 1
427
- assert 'D100' in err
428
- assert 'D101' not in err
429
- assert 'D103' not in err
430
+ assert 'D100' in out
431
+ assert 'D101' not in out
432
+ assert 'D103' not in out
430
433
431
434
432
435
def test_pep257_convention (env ):
@@ -442,13 +445,13 @@ def foo():
442
445
''' ))
443
446
444
447
env .write_config (convention = "pep257" )
445
- _ , err , code = env .invoke ()
448
+ out , err , code = env .invoke ()
446
449
assert code == 1
447
- assert 'D100' in err
448
- assert 'D211' in err
449
- assert 'D203' not in err
450
- assert 'D212' not in err
451
- assert 'D213' not in err
450
+ assert 'D100' in out
451
+ assert 'D211' in out
452
+ assert 'D203' not in out
453
+ assert 'D212' not in out
454
+ assert 'D213' not in out
452
455
453
456
454
457
def test_config_file_inheritance (env ):
@@ -483,11 +486,11 @@ def bar():
483
486
pass
484
487
""" ))
485
488
486
- _ , err , code = env .invoke ()
489
+ out , err , code = env .invoke ()
487
490
488
491
assert code == 1
489
- assert 'D100' in err
490
- assert 'D103' in err
492
+ assert 'D100' in out
493
+ assert 'D103' in out
491
494
492
495
493
496
def test_config_file_cumulative_add_ignores (env ):
@@ -522,9 +525,9 @@ def foo():
522
525
with env .open (os .path .join ('A' , 'a.py' ), 'wt' ) as test :
523
526
test .write (test_content )
524
527
525
- _ , err , code = env .invoke ()
528
+ out , err , code = env .invoke ()
526
529
527
- err = parse_errors (err )
530
+ err = parse_errors (out )
528
531
529
532
assert code == 1
530
533
assert 'base.py' in err , err
@@ -565,9 +568,9 @@ def foo():
565
568
with env .open (os .path .join ('A' , 'a.py' ), 'wt' ) as test :
566
569
test .write (test_content )
567
570
568
- _ , err , code = env .invoke ()
571
+ out , err , code = env .invoke ()
569
572
570
- err = parse_errors (err )
573
+ err = parse_errors (out )
571
574
572
575
assert code == 1
573
576
assert 'base.py' in err , err
@@ -605,12 +608,12 @@ def test_config_file_convention_overrides_select(env):
605
608
with env .open (os .path .join ('A' , 'a.py' ), 'wt' ) as test :
606
609
test .write (test_content )
607
610
608
- _ , err , code = env .invoke ()
611
+ out , err , code = env .invoke ()
609
612
610
613
assert code == 1
611
- assert 'D100' in err , err
612
- assert 'base.py' not in err , err
613
- assert 'a.py' in err , err
614
+ assert 'D100' in out , out
615
+ assert 'base.py' not in out , out
616
+ assert 'a.py' in out , out
614
617
615
618
616
619
def test_cli_overrides_config_file (env ):
@@ -642,13 +645,13 @@ def foo():
642
645
pass
643
646
""" ))
644
647
645
- _ , err , code = env .invoke (args = "--convention=pep257" )
648
+ out , err , code = env .invoke (args = "--convention=pep257" )
646
649
647
650
assert code == 1
648
- assert 'D100' in err , err
649
- assert 'D103' not in err , err
650
- assert 'base.py' in err , err
651
- assert 'a.py' not in err , err
651
+ assert 'D100' in out , out
652
+ assert 'D103' not in out , out
653
+ assert 'base.py' in out , out
654
+ assert 'a.py' not in out , out
652
655
653
656
654
657
def test_cli_match_overrides_config_file (env ):
@@ -681,13 +684,13 @@ def foo():
681
684
with env .open (os .path .join ('A' , 'a.py' ), 'wt' ) as test :
682
685
test .write ("" )
683
686
684
- _ , err , code = env .invoke (args = "--match=a.py --match-dir=A" )
687
+ out , err , code = env .invoke (args = "--match=a.py --match-dir=A" )
685
688
686
689
assert code == 1
687
- assert 'D100' in err , err
688
- assert 'D103' not in err , err
689
- assert 'base.py' not in err , err
690
- assert 'a.py' in err , err
690
+ assert 'D100' in out , out
691
+ assert 'D103' not in out , out
692
+ assert 'base.py' not in out , out
693
+ assert 'a.py' in out , out
691
694
692
695
693
696
def test_config_file_convention_overrides_ignore (env ):
@@ -722,13 +725,13 @@ def foo():
722
725
with env .open (os .path .join ('A' , 'a.py' ), 'wt' ) as test :
723
726
test .write (test_content )
724
727
725
- _ , err , code = env .invoke ()
728
+ out , err , code = env .invoke ()
726
729
727
730
assert code == 1
728
- assert 'D100' in err , err
729
- assert 'D103' in err , err
730
- assert 'base.py' not in err , err
731
- assert 'a.py' in err , err
731
+ assert 'D100' in out , out
732
+ assert 'D103' in out , out
733
+ assert 'base.py' not in out , out
734
+ assert 'a.py' in out , out
732
735
733
736
734
737
def test_config_file_ignore_overrides_select (env ):
@@ -764,9 +767,9 @@ def bar():
764
767
with env .open (os .path .join ('A' , 'a.py' ), 'wt' ) as test :
765
768
test .write (test_content )
766
769
767
- _ , err , code = env .invoke ()
770
+ out , err , code = env .invoke ()
768
771
769
- err = parse_errors (err )
772
+ err = parse_errors (out )
770
773
771
774
assert code == 1
772
775
assert 'base.py' in err , err
@@ -820,9 +823,9 @@ def bar():
820
823
with env .open (os .path .join ('B' , 'b.py' ), 'wt' ) as test :
821
824
test .write (test_content )
822
825
823
- _ , err , code = env .invoke ()
826
+ out , err , code = env .invoke ()
824
827
825
- err = parse_errors (err )
828
+ err = parse_errors (out )
826
829
827
830
assert code == 1
828
831
assert 'base.py' in err , err
0 commit comments