Skip to content

Commit ea14e9b

Browse files
Clean up legacy test dependencies (#2903)
Incremental progress towards our ongoing effort to modernize the test suite. By breaking the linear chain into small parallel groups, we are able to benefit from some amount of concurrency while limiting our exposure to implicit dependencies between tests. In the future, I plan to make more parallel groups and merge small groups into larger groups once we're confident that there is no additional flakiness associated with this change.
1 parent b3cd497 commit ea14e9b

3 files changed

Lines changed: 105 additions & 89 deletions

File tree

app/cdash/tests/CMakeLists.txt

Lines changed: 105 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,10 @@ add_legacy_unit_test(/CDash/LinkifyCompilerOutput)
8888

8989
add_unit_test(/Unit/app/Console/Command/ValidateXmlCommandTest)
9090

91+
add_php_test(seconds_from_interval)
92+
93+
add_php_test(extracttar)
94+
9195
###################################################################################################
9296

9397
add_laravel_test(/Feature/CDashTest)
@@ -407,28 +411,34 @@ add_php_test(projectmodel)
407411
set_tests_properties(projectmodel PROPERTIES DEPENDS projectindb)
408412

409413
add_php_test(querytests)
410-
set_tests_properties(querytests PROPERTIES DEPENDS projectmodel)
411-
412-
add_php_test(sitestatistics)
413-
set_tests_properties(sitestatistics PROPERTIES DEPENDS querytests)
414+
set_tests_properties(querytests PROPERTIES DEPENDS projectindb)
414415

415416
add_php_test(testoverview)
416-
set_tests_properties(testoverview PROPERTIES DEPENDS sitestatistics)
417+
set_tests_properties(testoverview PROPERTIES DEPENDS projectindb)
417418

418419
add_php_test(viewconfigure)
419-
set_tests_properties(viewconfigure PROPERTIES DEPENDS testoverview)
420+
set_tests_properties(viewconfigure PROPERTIES DEPENDS projectindb)
420421

421422
add_php_test(viewdynamicanalysis)
422-
set_tests_properties(viewdynamicanalysis PROPERTIES DEPENDS viewconfigure)
423+
set_tests_properties(viewdynamicanalysis PROPERTIES DEPENDS projectindb)
423424

424425
add_php_test(viewdynamicanalysisfile)
425-
set_tests_properties(viewdynamicanalysisfile PROPERTIES DEPENDS viewdynamicanalysis)
426+
set_tests_properties(viewdynamicanalysisfile PROPERTIES DEPENDS projectindb)
426427

427428
add_php_test(buildmodel)
428-
set_tests_properties(buildmodel PROPERTIES DEPENDS viewdynamicanalysisfile)
429+
set_tests_properties(buildmodel PROPERTIES DEPENDS projectindb)
429430

430431
add_legacy_unit_test(/CDash/Model/PendingSubmissions)
431-
set_tests_properties(/CDash/Model/PendingSubmissions PROPERTIES DEPENDS buildmodel)
432+
set_property(TEST /CDash/Model/PendingSubmissions PROPERTY DEPENDS
433+
pubproject
434+
projectmodel
435+
querytests
436+
testoverview
437+
viewconfigure
438+
viewdynamicanalysis
439+
viewdynamicanalysisfile
440+
buildmodel
441+
)
432442

433443
add_php_test(projectxmlsequence)
434444
set_tests_properties(projectxmlsequence PROPERTIES DEPENDS /CDash/Model/PendingSubmissions)
@@ -508,44 +518,46 @@ set_tests_properties(crosssubprojectcoverage PROPERTIES DEPENDS passwordcomplexi
508518
add_php_test(aggregatesubprojectcoverage)
509519
set_tests_properties(aggregatesubprojectcoverage PROPERTIES DEPENDS crosssubprojectcoverage)
510520

521+
add_php_test(dynamicanalysissummary)
522+
set_tests_properties(dynamicanalysissummary PROPERTIES DEPENDS aggregatesubprojectcoverage)
523+
511524
add_php_test(configurewarnings)
512-
set_tests_properties(configurewarnings PROPERTIES DEPENDS aggregatesubprojectcoverage)
525+
set_tests_properties(configurewarnings PROPERTIES DEPENDS dynamicanalysissummary)
513526

514527
add_php_test(filtertestlabels)
515-
set_tests_properties(filtertestlabels PROPERTIES DEPENDS configurewarnings)
516-
517-
add_php_test(seconds_from_interval)
518-
set_tests_properties(seconds_from_interval PROPERTIES DEPENDS filtertestlabels)
519-
520-
add_php_test(dynamicanalysissummary)
521-
set_tests_properties(dynamicanalysissummary PROPERTIES DEPENDS seconds_from_interval)
528+
set_tests_properties(filtertestlabels PROPERTIES DEPENDS dynamicanalysissummary)
522529

523530
add_php_test(viewsubprojects)
524531
set_tests_properties(viewsubprojects PROPERTIES DEPENDS dynamicanalysissummary)
525532

526533
add_php_test(truncateoutput)
527-
set_tests_properties(truncateoutput PROPERTIES DEPENDS viewsubprojects)
534+
set_tests_properties(truncateoutput PROPERTIES DEPENDS dynamicanalysissummary)
528535

529536
add_php_test(csvexport)
530-
set_tests_properties(csvexport PROPERTIES DEPENDS truncateoutput)
537+
set_tests_properties(csvexport PROPERTIES DEPENDS dynamicanalysissummary)
531538

532539
add_php_test(uniquediffs)
533-
set_tests_properties(uniquediffs PROPERTIES DEPENDS csvexport)
540+
set_tests_properties(uniquediffs PROPERTIES DEPENDS dynamicanalysissummary)
534541

535542
add_php_test(imagecomparison)
536-
set_tests_properties(imagecomparison PROPERTIES DEPENDS uniquediffs)
543+
set_tests_properties(imagecomparison PROPERTIES DEPENDS dynamicanalysissummary)
537544

538545
add_php_test(createprojectpermissions)
539-
set_tests_properties(createprojectpermissions PROPERTIES DEPENDS imagecomparison)
546+
set_property(TEST createprojectpermissions PROPERTY DEPENDS
547+
configurewarnings
548+
filtertestlabels
549+
viewsubprojects
550+
truncateoutput
551+
csvexport
552+
uniquediffs
553+
imagecomparison
554+
)
540555

541556
add_php_test(testgraphpermissions)
542557
set_tests_properties(testgraphpermissions PROPERTIES DEPENDS createprojectpermissions)
543558

544-
add_php_test(extracttar)
545-
set_tests_properties(extracttar PROPERTIES DEPENDS testgraphpermissions)
546-
547559
add_php_test(pdoexecutelogserrors)
548-
set_tests_properties(pdoexecutelogserrors PROPERTIES DEPENDS extracttar)
560+
set_tests_properties(pdoexecutelogserrors PROPERTIES DEPENDS testgraphpermissions)
549561

550562
add_php_test(revisionfilteracrossdates)
551563
set_tests_properties(revisionfilteracrossdates PROPERTIES DEPENDS actualtrilinossubmission)
@@ -601,89 +613,128 @@ set_tests_properties(submission_assign_buildid PROPERTIES DEPENDS buildrelations
601613
add_php_test(donehandler)
602614
set_tests_properties(donehandler PROPERTIES DEPENDS submission_assign_buildid)
603615

616+
####################################
617+
604618
add_php_test(changeid)
605619
set_tests_properties(changeid PROPERTIES DEPENDS donehandler)
606620

607621
add_php_test(expiredbuildrules)
608-
set_tests_properties(expiredbuildrules PROPERTIES DEPENDS changeid)
622+
set_tests_properties(expiredbuildrules PROPERTIES DEPENDS donehandler)
609623

610624
add_php_test(filterblocks)
611-
set_tests_properties(filterblocks PROPERTIES DEPENDS expiredbuildrules)
625+
set_tests_properties(filterblocks PROPERTIES DEPENDS donehandler)
612626

613627
add_php_test(indexnextprevious)
614-
set_tests_properties(indexnextprevious PROPERTIES DEPENDS filterblocks)
628+
set_tests_properties(indexnextprevious PROPERTIES DEPENDS donehandler)
615629

616630
add_php_test(putdynamicbuilds)
617-
set_tests_properties(putdynamicbuilds PROPERTIES DEPENDS indexnextprevious)
631+
set_tests_properties(putdynamicbuilds PROPERTIES DEPENDS donehandler)
618632

619633
add_php_test(commitauthornotification)
620-
set_tests_properties(commitauthornotification PROPERTIES DEPENDS putdynamicbuilds)
634+
set_tests_properties(commitauthornotification PROPERTIES
635+
DEPENDS donehandler
636+
RUN_SERIAL TRUE
637+
)
621638

622639
add_php_test(subscribeprojectshowlabels)
623-
set_tests_properties(subscribeprojectshowlabels PROPERTIES DEPENDS putdynamicbuilds)
640+
set_tests_properties(subscribeprojectshowlabels PROPERTIES DEPENDS donehandler)
624641

625642
add_php_test(consistenttestingday)
626-
set_tests_properties(consistenttestingday PROPERTIES DEPENDS subscribeprojectshowlabels)
643+
set_tests_properties(consistenttestingday PROPERTIES DEPENDS donehandler)
627644

628645
add_php_test(numericupdate)
629-
set_tests_properties(numericupdate PROPERTIES DEPENDS consistenttestingday)
646+
set_tests_properties(numericupdate PROPERTIES DEPENDS donehandler)
630647

631648
add_php_test(attachedfiles)
632-
set_tests_properties(attachedfiles PROPERTIES DEPENDS numericupdate)
649+
set_tests_properties(attachedfiles PROPERTIES DEPENDS donehandler)
633650

634651
add_php_test(subprojectorder)
635-
set_tests_properties(subprojectorder PROPERTIES DEPENDS attachedfiles)
652+
set_tests_properties(subprojectorder PROPERTIES DEPENDS donehandler)
636653

637654
add_php_test(testimages)
638-
set_tests_properties(testimages PROPERTIES DEPENDS subprojectorder)
655+
set_tests_properties(testimages PROPERTIES DEPENDS donehandler)
639656

640657
add_php_test(dynamicanalysislogs)
641-
set_tests_properties(dynamicanalysislogs PROPERTIES DEPENDS testimages)
658+
set_tests_properties(dynamicanalysislogs PROPERTIES DEPENDS donehandler)
642659

643660
add_php_test(namedmeasurements)
644-
set_tests_properties(namedmeasurements PROPERTIES DEPENDS dynamicanalysislogs)
661+
set_tests_properties(namedmeasurements PROPERTIES DEPENDS donehandler)
645662

646663
add_php_test(longbuildname)
647-
set_tests_properties(longbuildname PROPERTIES DEPENDS namedmeasurements)
664+
set_tests_properties(longbuildname PROPERTIES DEPENDS donehandler)
648665

649666
add_php_test(multiplelabelsfortests)
650-
set_tests_properties(multiplelabelsfortests PROPERTIES DEPENDS longbuildname)
667+
set_tests_properties(multiplelabelsfortests PROPERTIES DEPENDS donehandler)
651668

652669
add_php_test(subprojecttestfilters)
653-
set_tests_properties(subprojecttestfilters PROPERTIES DEPENDS multiplelabelsfortests)
670+
set_tests_properties(subprojecttestfilters PROPERTIES DEPENDS donehandler)
654671

655672
add_php_test(dynamicanalysisdefectlongtype)
656-
set_tests_properties(dynamicanalysisdefectlongtype PROPERTIES DEPENDS multiplelabelsfortests)
673+
set_tests_properties(dynamicanalysisdefectlongtype PROPERTIES DEPENDS donehandler)
657674

658675
add_php_test(starttimefromnotes)
659-
set_tests_properties(starttimefromnotes PROPERTIES DEPENDS dynamicanalysisdefectlongtype)
676+
set_tests_properties(starttimefromnotes PROPERTIES DEPENDS donehandler)
660677

661678
add_php_test(starttimefromupload)
662-
set_tests_properties(starttimefromupload PROPERTIES DEPENDS starttimefromnotes)
679+
set_tests_properties(starttimefromupload PROPERTIES
680+
DEPENDS donehandler
681+
RUN_SERIAL TRUE
682+
)
663683

664684
add_php_test(querytestsfilterlabels)
665-
set_tests_properties(querytestsfilterlabels PROPERTIES DEPENDS starttimefromupload)
685+
set_tests_properties(querytestsfilterlabels PROPERTIES DEPENDS donehandler)
666686

667687
add_php_test(lotsofsubprojects)
668-
set_tests_properties(lotsofsubprojects PROPERTIES DEPENDS querytestsfilterlabels)
688+
set_tests_properties(lotsofsubprojects PROPERTIES DEPENDS donehandler)
669689

670690
add_php_test(querytestsrevisionfilter)
671-
set_tests_properties(querytestsrevisionfilter PROPERTIES DEPENDS lotsofsubprojects)
691+
set_tests_properties(querytestsrevisionfilter PROPERTIES DEPENDS donehandler)
672692

673693
add_php_test(redundanttests)
674-
set_tests_properties(redundanttests PROPERTIES DEPENDS querytestsrevisionfilter)
694+
set_tests_properties(redundanttests PROPERTIES DEPENDS donehandler)
675695

676696
add_php_test(configureappend)
677-
set_tests_properties(configureappend PROPERTIES DEPENDS redundanttests)
697+
set_tests_properties(configureappend PROPERTIES DEPENDS donehandler)
678698

679699
add_php_test(notesparsererrormessages)
680-
set_tests_properties(notesparsererrormessages PROPERTIES DEPENDS configureappend)
700+
set_tests_properties(notesparsererrormessages PROPERTIES
701+
DEPENDS donehandler
702+
RUN_SERIAL TRUE
703+
)
681704

682705
add_laravel_test(/Feature/SubProjectDependencies)
683-
set_tests_properties(/Feature/SubProjectDependencies PROPERTIES DEPENDS notesparsererrormessages)
706+
set_tests_properties(/Feature/SubProjectDependencies PROPERTIES DEPENDS donehandler)
684707

685708
add_php_test(misassignedconfigure)
686-
set_tests_properties(misassignedconfigure PROPERTIES DEPENDS /Feature/SubProjectDependencies)
709+
set_property(TEST misassignedconfigure PROPERTY DEPENDS
710+
changeid
711+
expiredbuildrules
712+
filterblocks
713+
indexnextprevious
714+
putdynamicbuilds
715+
commitauthornotification
716+
subscribeprojectshowlabels
717+
consistenttestingday
718+
numericupdate
719+
attachedfiles
720+
subprojectorder
721+
testimages
722+
dynamicanalysislogs
723+
namedmeasurements
724+
longbuildname
725+
multiplelabelsfortests
726+
subprojecttestfilters
727+
dynamicanalysisdefectlongtype
728+
starttimefromnotes
729+
starttimefromupload
730+
querytestsfilterlabels
731+
lotsofsubprojects
732+
querytestsrevisionfilter
733+
redundanttests
734+
configureappend
735+
notesparsererrormessages
736+
/Feature/SubProjectDependencies
737+
)
687738

688739
add_subdirectory(ctest)
689740
add_subdirectory(autoremovebuilds)

app/cdash/tests/test_sitestatistics.php

Lines changed: 0 additions & 25 deletions
This file was deleted.

phpstan-baseline.neon

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23975,16 +23975,6 @@ parameters:
2397523975
count: 3
2397623976
path: app/cdash/tests/test_sequenceindependence.php
2397723977

23978-
-
23979-
message: "#^Call to deprecated method pass\\(\\) of class SimpleTestCase\\.$#"
23980-
count: 1
23981-
path: app/cdash/tests/test_sitestatistics.php
23982-
23983-
-
23984-
message: "#^Method SiteStatisticsTestCase\\:\\:testSiteStatistics\\(\\) has no return type specified\\.$#"
23985-
count: 1
23986-
path: app/cdash/tests/test_sitestatistics.php
23987-
2398823978
-
2398923979
message: """
2399023980
#^Call to deprecated method submission\\(\\) of class KWWebTestCase\\:

0 commit comments

Comments
 (0)