|
18 | 18 | ReportLevelTotalsFactory, |
19 | 19 | RepositoryFlagFactory, |
20 | 20 | UploadFactory, |
21 | | - UploadLevelTotalsFactory, |
22 | 21 | ) |
23 | 22 | from helpers.exceptions import RepositoryWithoutValidBotError |
24 | 23 | from services.archive import ArchiveService |
@@ -477,18 +476,6 @@ def test_build_report_from_commit(self, dbsession, mock_storage): |
477 | 476 |
|
478 | 477 | upload = UploadFactory(report=report, order_number=0, upload_type="upload") |
479 | 478 | dbsession.add(upload) |
480 | | - upload_totals = UploadLevelTotalsFactory( |
481 | | - upload=upload, |
482 | | - files=3, |
483 | | - lines=20, |
484 | | - hits=17, |
485 | | - misses=3, |
486 | | - partials=0, |
487 | | - coverage=85.0, |
488 | | - branches=0, |
489 | | - methods=0, |
490 | | - ) |
491 | | - dbsession.add(upload_totals) |
492 | 479 | dbsession.commit() |
493 | 480 | dbsession.flush() |
494 | 481 |
|
@@ -524,21 +511,6 @@ def test_build_report_from_commit(self, dbsession, mock_storage): |
524 | 511 | assert len(report.sessions) == 1 |
525 | 512 | assert report.sessions[0].flags == [] |
526 | 513 | assert report.sessions[0].session_type == SessionType.uploaded |
527 | | - assert report.sessions[0].totals == ReportTotals( |
528 | | - files=3, |
529 | | - lines=20, |
530 | | - hits=17, |
531 | | - misses=3, |
532 | | - partials=0, |
533 | | - coverage=Decimal("85.00"), |
534 | | - branches=0, |
535 | | - methods=0, |
536 | | - messages=0, |
537 | | - sessions=0, |
538 | | - complexity=0, |
539 | | - complexity_total=0, |
540 | | - diff=0, |
541 | | - ) |
542 | 514 |
|
543 | 515 | # make sure report is still serializable |
544 | 516 | ReportService({}).save_report(commit, report) |
@@ -606,73 +578,25 @@ def test_build_report_from_commit_with_flags(self, dbsession, mock_storage): |
606 | 578 | report=report, flags=[flag1], order_number=0, upload_type="upload" |
607 | 579 | ) |
608 | 580 | dbsession.add(upload1) |
609 | | - upload_totals1 = UploadLevelTotalsFactory( |
610 | | - upload=upload1, |
611 | | - files=3, |
612 | | - lines=20, |
613 | | - hits=17, |
614 | | - misses=3, |
615 | | - partials=0, |
616 | | - coverage=85.0, |
617 | | - branches=0, |
618 | | - methods=0, |
619 | | - ) |
620 | | - dbsession.add(upload_totals1) |
621 | 581 | dbsession.commit() |
622 | 582 |
|
623 | 583 | upload2 = UploadFactory( |
624 | 584 | report=report, flags=[flag1], order_number=1, upload_type="carriedforward" |
625 | 585 | ) |
626 | 586 | dbsession.add(upload2) |
627 | | - upload_totals2 = UploadLevelTotalsFactory( |
628 | | - upload=upload2, |
629 | | - files=3, |
630 | | - lines=20, |
631 | | - hits=20, |
632 | | - misses=0, |
633 | | - partials=0, |
634 | | - coverage=100.0, |
635 | | - branches=0, |
636 | | - methods=0, |
637 | | - ) |
638 | | - dbsession.add(upload_totals2) |
639 | 587 | dbsession.commit() |
640 | 588 |
|
641 | 589 | upload3 = UploadFactory( |
642 | 590 | report=report, flags=[flag2], order_number=2, upload_type="carriedforward" |
643 | 591 | ) |
644 | 592 | dbsession.add(upload3) |
645 | | - upload_totals3 = UploadLevelTotalsFactory( |
646 | | - upload=upload3, |
647 | | - files=3, |
648 | | - lines=20, |
649 | | - hits=20, |
650 | | - misses=0, |
651 | | - partials=0, |
652 | | - coverage=100.0, |
653 | | - branches=0, |
654 | | - methods=0, |
655 | | - ) |
656 | | - dbsession.add(upload_totals3) |
657 | 593 | dbsession.commit() |
658 | 594 | dbsession.flush() |
659 | 595 |
|
660 | 596 | upload4 = UploadFactory( |
661 | 597 | report=report, flags=[flag3], order_number=3, upload_type="upload" |
662 | 598 | ) |
663 | 599 | dbsession.add(upload4) |
664 | | - upload_totals4 = UploadLevelTotalsFactory( |
665 | | - upload=upload4, |
666 | | - files=3, |
667 | | - lines=20, |
668 | | - hits=20, |
669 | | - misses=0, |
670 | | - partials=0, |
671 | | - coverage=100.0, |
672 | | - branches=0, |
673 | | - methods=0, |
674 | | - ) |
675 | | - dbsession.add(upload_totals4) |
676 | 600 | dbsession.commit() |
677 | 601 | dbsession.flush() |
678 | 602 |
|
@@ -719,39 +643,9 @@ def test_build_report_from_commit_with_flags(self, dbsession, mock_storage): |
719 | 643 | assert len(report.sessions) == 2 |
720 | 644 | assert report.sessions[0].flags == ["unit"] |
721 | 645 | assert report.sessions[0].session_type == SessionType.uploaded |
722 | | - assert report.sessions[0].totals == ReportTotals( |
723 | | - files=3, |
724 | | - lines=20, |
725 | | - hits=17, |
726 | | - misses=3, |
727 | | - partials=0, |
728 | | - coverage=Decimal("85.00"), |
729 | | - branches=0, |
730 | | - methods=0, |
731 | | - messages=0, |
732 | | - sessions=0, |
733 | | - complexity=0, |
734 | | - complexity_total=0, |
735 | | - diff=0, |
736 | | - ) |
737 | 646 | assert 1 not in report.sessions # CF w/ equivalent direct upload |
738 | 647 | assert report.sessions[2].flags == ["integration"] |
739 | 648 | assert report.sessions[2].session_type == SessionType.carriedforward |
740 | | - assert report.sessions[2].totals == ReportTotals( |
741 | | - files=3, |
742 | | - lines=20, |
743 | | - hits=20, |
744 | | - misses=0, |
745 | | - partials=0, |
746 | | - coverage=Decimal("100.00"), |
747 | | - branches=0, |
748 | | - methods=0, |
749 | | - messages=0, |
750 | | - sessions=0, |
751 | | - complexity=0, |
752 | | - complexity_total=0, |
753 | | - diff=0, |
754 | | - ) |
755 | 649 | assert 3 not in report.sessions # labels flag w/ empty label set |
756 | 650 |
|
757 | 651 | # make sure report is still serializable |
@@ -3576,15 +3470,6 @@ def test_save_full_report( |
3576 | 3470 | assert len(first_upload.flags) == 1 |
3577 | 3471 | assert first_upload.flags[0].repository == commit.repository |
3578 | 3472 | assert first_upload.flags[0].flag_name == "unit" |
3579 | | - assert first_upload.totals is not None |
3580 | | - assert first_upload.totals.branches == 0 |
3581 | | - assert first_upload.totals.coverage == Decimal("0.0") |
3582 | | - assert first_upload.totals.hits == 0 |
3583 | | - assert first_upload.totals.lines == 10 |
3584 | | - assert first_upload.totals.methods == 0 |
3585 | | - assert first_upload.totals.misses == 0 |
3586 | | - assert first_upload.totals.partials == 0 |
3587 | | - assert first_upload.totals.files == 2 |
3588 | 3473 | assert first_upload.upload_extras == {} |
3589 | 3474 | assert first_upload.upload_type == "uploaded" |
3590 | 3475 | assert second_upload.build_code == "poli" |
|
0 commit comments