Merge pull request #20901 from demeritcowboy/fix-api4test

[NFC/Unit test] #2699 - Fix intermittent api4 test (part 1)

tests/phpunit/api/v4/Action/BaseCustomValueTest.php

@@ -31,6 +31,11 @@ abstract class BaseCustomValueTest extends UnitTestCase {
    * @throws \API_Exception
    */
   public function tearDown(): void {
+    $optgroups = CustomField::get(FALSE)->addSelect('option_group_id')->addWhere('option_group_id', 'IS NOT NULL')->execute();
+    foreach ($optgroups as $optgroup) {
+      \Civi\Api4\OptionValue::delete(FALSE)->addWhere('option_group_id', '=', $optgroup['option_group_id'])->execute();
+      \Civi\Api4\OptionGroup::delete(FALSE)->addWhere('id', '=', $optgroup['option_group_id'])->execute();
+    }
     CustomField::delete(FALSE)->addWhere('id', '>', 0)->execute();
     CustomGroup::delete(FALSE)->addWhere('id', '>', 0)->execute();
     parent::tearDown();