Restore test_removebuilds

Half of this test was accidentally disabled in ...
Kitware · Nov 22, 2024 · ebca0d5 · ebca0d5
1 parent e36f195
commit ebca0d5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/app/Utils/DatabaseCleanupUtils.php b/app/Utils/DatabaseCleanupUtils.php
@@ -266,8 +266,6 @@ public static function removeBuild($buildid) : void
             // Use array_diff to get the list of tests that should be deleted.
             $testoutputs_to_delete = array_diff($all_outputids, $testoutputs_to_save);
             if (!empty($testoutputs_to_delete)) {
-                self::deleteRowsChunked('DELETE FROM testoutput WHERE id IN ', $testoutputs_to_delete);
-
                 $testoutputs_to_delete_prepare_array = $db->createPreparedArray(count($testoutputs_to_delete));
                 // Check if the images for the test are not shared
                 $test2image = DB::select("
@@ -291,6 +289,8 @@ public static function removeBuild($buildid) : void
                     $imgids_prepare_array = $db->createPreparedArray(count($imgids));
                     DB::delete("DELETE FROM image WHERE id IN $imgids_prepare_array", $imgids);
                 }
+
+                self::deleteRowsChunked('DELETE FROM testoutput WHERE id IN ', $testoutputs_to_delete);
             }
         }
 

diff --git a/app/cdash/tests/test_removebuilds.php b/app/cdash/tests/test_removebuilds.php
@@ -426,9 +426,6 @@ public function testBuildRemovalWorksAsExpected()
         $this->verify('label2dynamicanalysis', 'labelid', '=', $labelid, 1);
         $this->verify('label2test', 'labelid', '=', $labelid, 3);
 
-        echo "Check on labelid = $labelid\n";
-        return;
-
         // Remove the build.
         DatabaseCleanupUtils::removeBuild($build->Id);
 
@@ -465,14 +462,17 @@ public function testBuildRemovalWorksAsExpected()
         $this->verify('label2buildfailure', 'labelid', '=', $labelid, 1, true);
         $this->verify('label2coveragefile', 'labelid', '=', $labelid, 1, true);
         $this->verify('label2dynamicanalysis', 'labelid', '=', $labelid, 0, true);
-        $this->verify('label2test', 'labelid', '=', $labelid, 0, true);
+        $this->verify('label2test', 'labelid', '=', $labelid, 1, true);
         $this->verify('note', 'id', 'IN', $noteids, 1, true);
         $this->verify('summaryemail', 'buildid', '=', $build->Id, 0, true);
         $this->verify('subproject2build', 'buildid', '=', $build->Id, 0, true);
         $this->verify('test2image', 'outputid', 'IN', $outputids, 1, true);
         $this->verify('testdiff', 'buildid', '=', $build->Id, 0, true);
         $this->verify('updatefile', 'updateid', '=', $updateid, 1, true);
         $this->verify('uploadfile', 'id', 'IN', $uploadfileids, 1, true);
+
+        // Remove the other build too to make this test idempotent.
+        DatabaseCleanupUtils::removeBuild($existing_build->Id);
     }
 
     public function verify($table, $field, $compare, $value, $expected, $deleted=false)