Skip to content

Commit fe3c82f

Browse files
yileiyilei
committed
Reformat setup.py too.
1 parent c2decf7 commit fe3c82f

File tree

1 file changed

+42
-84
lines changed

1 file changed

+42
-84
lines changed

‎tests/test_black.py‎

Lines changed: 42 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -466,10 +466,8 @@ def err(msg: str, **kwargs: Any) -> None:
466466
self.assertEqual(err_lines[-1], "error: cannot format e1: boom")
467467
self.assertEqual(
468468
unstyle(str(report)),
469-
(
470-
"1 file reformatted, 2 files left unchanged, 1 file failed to"
471-
" reformat."
472-
),
469+
"1 file reformatted, 2 files left unchanged, 1 file failed to"
470+
" reformat.",
473471
)
474472
self.assertEqual(report.return_code, 123)
475473
report.done(Path("f3"), black.Changed.YES)
@@ -478,10 +476,8 @@ def err(msg: str, **kwargs: Any) -> None:
478476
self.assertEqual(out_lines[-1], "reformatted f3")
479477
self.assertEqual(
480478
unstyle(str(report)),
481-
(
482-
"2 files reformatted, 2 files left unchanged, 1 file failed to"
483-
" reformat."
484-
),
479+
"2 files reformatted, 2 files left unchanged, 1 file failed to"
480+
" reformat.",
485481
)
486482
self.assertEqual(report.return_code, 123)
487483
report.failed(Path("e2"), "boom")
@@ -490,10 +486,8 @@ def err(msg: str, **kwargs: Any) -> None:
490486
self.assertEqual(err_lines[-1], "error: cannot format e2: boom")
491487
self.assertEqual(
492488
unstyle(str(report)),
493-
(
494-
"2 files reformatted, 2 files left unchanged, 2 files failed to"
495-
" reformat."
496-
),
489+
"2 files reformatted, 2 files left unchanged, 2 files failed to"
490+
" reformat.",
497491
)
498492
self.assertEqual(report.return_code, 123)
499493
report.path_ignored(Path("wat"), "no match")
@@ -502,10 +496,8 @@ def err(msg: str, **kwargs: Any) -> None:
502496
self.assertEqual(out_lines[-1], "wat ignored: no match")
503497
self.assertEqual(
504498
unstyle(str(report)),
505-
(
506-
"2 files reformatted, 2 files left unchanged, 2 files failed to"
507-
" reformat."
508-
),
499+
"2 files reformatted, 2 files left unchanged, 2 files failed to"
500+
" reformat.",
509501
)
510502
self.assertEqual(report.return_code, 123)
511503
report.done(Path("f4"), black.Changed.NO)
@@ -514,28 +506,22 @@ def err(msg: str, **kwargs: Any) -> None:
514506
self.assertEqual(out_lines[-1], "f4 already well formatted, good job.")
515507
self.assertEqual(
516508
unstyle(str(report)),
517-
(
518-
"2 files reformatted, 3 files left unchanged, 2 files failed to"
519-
" reformat."
520-
),
509+
"2 files reformatted, 3 files left unchanged, 2 files failed to"
510+
" reformat.",
521511
)
522512
self.assertEqual(report.return_code, 123)
523513
report.check = True
524514
self.assertEqual(
525515
unstyle(str(report)),
526-
(
527-
"2 files would be reformatted, 3 files would be left unchanged, 2"
528-
" files would fail to reformat."
529-
),
516+
"2 files would be reformatted, 3 files would be left unchanged, 2"
517+
" files would fail to reformat.",
530518
)
531519
report.check = False
532520
report.diff = True
533521
self.assertEqual(
534522
unstyle(str(report)),
535-
(
536-
"2 files would be reformatted, 3 files would be left unchanged, 2"
537-
" files would fail to reformat."
538-
),
523+
"2 files would be reformatted, 3 files would be left unchanged, 2"
524+
" files would fail to reformat.",
539525
)
540526

541527
def test_report_quiet(self) -> None:
@@ -577,21 +563,17 @@ def err(msg: str, **kwargs: Any) -> None:
577563
self.assertEqual(err_lines[-1], "error: cannot format e1: boom")
578564
self.assertEqual(
579565
unstyle(str(report)),
580-
(
581-
"1 file reformatted, 2 files left unchanged, 1 file failed to"
582-
" reformat."
583-
),
566+
"1 file reformatted, 2 files left unchanged, 1 file failed to"
567+
" reformat.",
584568
)
585569
self.assertEqual(report.return_code, 123)
586570
report.done(Path("f3"), black.Changed.YES)
587571
self.assertEqual(len(out_lines), 0)
588572
self.assertEqual(len(err_lines), 1)
589573
self.assertEqual(
590574
unstyle(str(report)),
591-
(
592-
"2 files reformatted, 2 files left unchanged, 1 file failed to"
593-
" reformat."
594-
),
575+
"2 files reformatted, 2 files left unchanged, 1 file failed to"
576+
" reformat.",
595577
)
596578
self.assertEqual(report.return_code, 123)
597579
report.failed(Path("e2"), "boom")
@@ -600,50 +582,40 @@ def err(msg: str, **kwargs: Any) -> None:
600582
self.assertEqual(err_lines[-1], "error: cannot format e2: boom")
601583
self.assertEqual(
602584
unstyle(str(report)),
603-
(
604-
"2 files reformatted, 2 files left unchanged, 2 files failed to"
605-
" reformat."
606-
),
585+
"2 files reformatted, 2 files left unchanged, 2 files failed to"
586+
" reformat.",
607587
)
608588
self.assertEqual(report.return_code, 123)
609589
report.path_ignored(Path("wat"), "no match")
610590
self.assertEqual(len(out_lines), 0)
611591
self.assertEqual(len(err_lines), 2)
612592
self.assertEqual(
613593
unstyle(str(report)),
614-
(
615-
"2 files reformatted, 2 files left unchanged, 2 files failed to"
616-
" reformat."
617-
),
594+
"2 files reformatted, 2 files left unchanged, 2 files failed to"
595+
" reformat.",
618596
)
619597
self.assertEqual(report.return_code, 123)
620598
report.done(Path("f4"), black.Changed.NO)
621599
self.assertEqual(len(out_lines), 0)
622600
self.assertEqual(len(err_lines), 2)
623601
self.assertEqual(
624602
unstyle(str(report)),
625-
(
626-
"2 files reformatted, 3 files left unchanged, 2 files failed to"
627-
" reformat."
628-
),
603+
"2 files reformatted, 3 files left unchanged, 2 files failed to"
604+
" reformat.",
629605
)
630606
self.assertEqual(report.return_code, 123)
631607
report.check = True
632608
self.assertEqual(
633609
unstyle(str(report)),
634-
(
635-
"2 files would be reformatted, 3 files would be left unchanged, 2"
636-
" files would fail to reformat."
637-
),
610+
"2 files would be reformatted, 3 files would be left unchanged, 2"
611+
" files would fail to reformat.",
638612
)
639613
report.check = False
640614
report.diff = True
641615
self.assertEqual(
642616
unstyle(str(report)),
643-
(
644-
"2 files would be reformatted, 3 files would be left unchanged, 2"
645-
" files would fail to reformat."
646-
),
617+
"2 files would be reformatted, 3 files would be left unchanged, 2"
618+
" files would fail to reformat.",
647619
)
648620

649621
def test_report_normal(self) -> None:
@@ -687,10 +659,8 @@ def err(msg: str, **kwargs: Any) -> None:
687659
self.assertEqual(err_lines[-1], "error: cannot format e1: boom")
688660
self.assertEqual(
689661
unstyle(str(report)),
690-
(
691-
"1 file reformatted, 2 files left unchanged, 1 file failed to"
692-
" reformat."
693-
),
662+
"1 file reformatted, 2 files left unchanged, 1 file failed to"
663+
" reformat.",
694664
)
695665
self.assertEqual(report.return_code, 123)
696666
report.done(Path("f3"), black.Changed.YES)
@@ -699,10 +669,8 @@ def err(msg: str, **kwargs: Any) -> None:
699669
self.assertEqual(out_lines[-1], "reformatted f3")
700670
self.assertEqual(
701671
unstyle(str(report)),
702-
(
703-
"2 files reformatted, 2 files left unchanged, 1 file failed to"
704-
" reformat."
705-
),
672+
"2 files reformatted, 2 files left unchanged, 1 file failed to"
673+
" reformat.",
706674
)
707675
self.assertEqual(report.return_code, 123)
708676
report.failed(Path("e2"), "boom")
@@ -711,50 +679,40 @@ def err(msg: str, **kwargs: Any) -> None:
711679
self.assertEqual(err_lines[-1], "error: cannot format e2: boom")
712680
self.assertEqual(
713681
unstyle(str(report)),
714-
(
715-
"2 files reformatted, 2 files left unchanged, 2 files failed to"
716-
" reformat."
717-
),
682+
"2 files reformatted, 2 files left unchanged, 2 files failed to"
683+
" reformat.",
718684
)
719685
self.assertEqual(report.return_code, 123)
720686
report.path_ignored(Path("wat"), "no match")
721687
self.assertEqual(len(out_lines), 2)
722688
self.assertEqual(len(err_lines), 2)
723689
self.assertEqual(
724690
unstyle(str(report)),
725-
(
726-
"2 files reformatted, 2 files left unchanged, 2 files failed to"
727-
" reformat."
728-
),
691+
"2 files reformatted, 2 files left unchanged, 2 files failed to"
692+
" reformat.",
729693
)
730694
self.assertEqual(report.return_code, 123)
731695
report.done(Path("f4"), black.Changed.NO)
732696
self.assertEqual(len(out_lines), 2)
733697
self.assertEqual(len(err_lines), 2)
734698
self.assertEqual(
735699
unstyle(str(report)),
736-
(
737-
"2 files reformatted, 3 files left unchanged, 2 files failed to"
738-
" reformat."
739-
),
700+
"2 files reformatted, 3 files left unchanged, 2 files failed to"
701+
" reformat.",
740702
)
741703
self.assertEqual(report.return_code, 123)
742704
report.check = True
743705
self.assertEqual(
744706
unstyle(str(report)),
745-
(
746-
"2 files would be reformatted, 3 files would be left unchanged, 2"
747-
" files would fail to reformat."
748-
),
707+
"2 files would be reformatted, 3 files would be left unchanged, 2"
708+
" files would fail to reformat.",
749709
)
750710
report.check = False
751711
report.diff = True
752712
self.assertEqual(
753713
unstyle(str(report)),
754-
(
755-
"2 files would be reformatted, 3 files would be left unchanged, 2"
756-
" files would fail to reformat."
757-
),
714+
"2 files would be reformatted, 3 files would be left unchanged, 2"
715+
" files would fail to reformat.",
758716
)
759717

760718
def test_lib2to3_parse(self) -> None:

0 commit comments

Comments
 (0)