BaseTestCase: Change parent class to \Icinga\Test\BaseTestCase and …

…fix-multiple-test-runs
Icinga · Jan 15, 2024 · f97512f · f97512f
1 parent 42cc6fd
commit f97512f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/library/Director/Test/BaseTestCase.php b/library/Director/Test/BaseTestCase.php
@@ -12,14 +12,14 @@
 use Icinga\Module\Director\Objects\IcingaZone;
 use PHPUnit\Framework\TestCase;
 
-abstract class BaseTestCase extends TestCase
+abstract class BaseTestCase extends \Icinga\Test\BaseTestCase
 {
     private static $app;
 
     /** @var Db */
     private static $db;
 
-    public function setUp(): void
+    public function ssetUp(): void
     {
         $this->app();
     }
@@ -81,11 +81,14 @@ protected static function getDb()
             self::$db = new Db($dbConfig);
             $migrations = new Migrations(self::$db);
             $migrations->applyPendingMigrations();
-            IcingaZone::create([
+            $zone = IcingaZone::create([
                 'object_name' => 'director-global',
                 'object_type' => 'external_object',
                 'is_global'   => 'y'
-            ])->store(self::$db);
+            ]);
+            if (! IcingaZone::exists($zone->getId(), self::$db)) {
+                $zone->store(self::$db);
+            }
         }
 
         return self::$db;

diff --git a/test/config/config.ini b/test/config/config.ini
diff --git a/test/php/library/Director/Objects/IcingaHostTest.php b/test/php/library/Director/Objects/IcingaHostTest.php
@@ -747,7 +747,7 @@ public function tearDown(): void
                 }
             }
 
-            $kill = array('___TEST___zone');
+            $kill = ['___TEST___zone', '___TEST___zone2'];
             foreach ($kill as $name) {
                 if (IcingaZone::exists($name, $db)) {
                     IcingaZone::load($name, $db)->delete();

diff --git a/test/php/library/Director/Objects/IcingaServiceTest.php b/test/php/library/Director/Objects/IcingaServiceTest.php
@@ -44,6 +44,7 @@ public function testFailsToStoreWithMissingLazyRelations()
 
     public function testAcceptsAssignRules()
     {
+        $this->expectNotToPerformAssertions();
         $service = $this->service();
         $service->object_type = 'apply';
         $service->assign_filter = 'host.address="127.*"';