fix: tests

utopia-php · Jun 19, 2024 · 3daa0b7 · 3daa0b7
1 parent 32534e9
commit 3daa0b7
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 46 deletions.
diff --git a/src/Orchestration/Adapter/DockerAPI.php b/src/Orchestration/Adapter/DockerAPI.php
@@ -479,18 +479,25 @@ public function run(
             'WorkingDir' => $workdir,
             'Labels' => (object) $labels,
             'Env' => array_values($vars),
-            'Mounts' => $mountFolder ? [['Type' => 'bind', 'Source' => $mountFolder, 'Target' => '/tmp', 'RW' => true]] : [],
             'HostConfig' => [
                 'Binds' => $volumes,
-                'CpuQuota' => ! empty($this->cpus) ? floatval($this->cpus) * 100000 : null,
-                'CpuPeriod' => ! empty($this->cpus) ? 100000 : null,
-                'Memory' => ! empty($this->memory) ? intval($this->memory) * 1e+6 : null, // Convert into bytes
-                'MemorySwap' => ! empty($this->swap) ? intval($this->swap) * 1e+6 : null, // Convert into bytes
+                'CpuQuota' => floatval($this->cpus) * 100000,
+                'CpuPeriod' => 100000,
+                'Memory' => intval($this->memory) * 1e+6, // Convert into bytes
+                'MemorySwap' => intval($this->swap) * 1e+6, // Convert into bytes
                 'AutoRemove' => $remove,
                 'NetworkMode' => ! empty($network) ? $network : null,
             ],
         ];
 
+        if (! empty($mountFolder)) {
+            $body['HostConfig']['Binds'][] = $mountFolder.':/tmp';
+        }
+
+        $body = array_filter($body, function ($value) {
+            return ! empty($value);
+        });
+
         $result = $this->call('http://localhost/containers/create?name='.$name, 'POST', json_encode($body), [
             'Content-Type: application/json',
             'Content-Length: '.\strlen(\json_encode($body)),

diff --git a/tests/Orchestration/Base.php b/tests/Orchestration/Base.php
@@ -16,31 +16,6 @@ abstract protected static function getAdapterName(): string;
      */
     public static $containerID;
 
-    public static function setUpBeforeClass(): void
-    {
-        $testContainers = [
-            'TestContainer',
-            'TestContainerTimeout',
-            'TestContainerBadBuild',
-            'UsageStats1',
-            'UsageStats2',
-            'TestContainerRM',
-            'TestContainerRM2',
-        ];
-
-        foreach (static::getOrchestration()->list() as $activeContainer) {
-            if (in_array($activeContainer->getName(), $testContainers)) {
-                static::getOrchestration()->remove($activeContainer->getName(), true);
-            }
-        }
-
-        foreach (static::getOrchestration()->listNetworks() as $activeNetwork) {
-            if ($activeNetwork->getName() === 'TestNetwork') {
-                static::getOrchestration()->removeNetwork($activeNetwork->getName());
-            }
-        }
-    }
-
     public function setUp(): void
     {
     }
@@ -168,17 +143,7 @@ public function testListNetworks(): void
     /**
      * @depends testCreateNetwork
      */
-    public function testnetworkConnect(): void
-    {
-        $response = static::getOrchestration()->networkConnect('TestContainer', 'TestNetwork');
-
-        $this->assertEquals(true, $response);
-    }
-
-    /**
-     * @depends testCreateNetwork
-     */
-    public function testCreateContainerWithNetwork(): void
+    public function testNetworkConnect(): void
     {
         $response = static::getOrchestration()->run(
             'appwrite/runtime-for-php:8.0',
@@ -204,20 +169,26 @@ public function testCreateContainerWithNetwork(): void
         );
 
         $this->assertNotEmpty($response);
+
+        sleep(1); // wait for container
+
+        $response = static::getOrchestration()->networkConnect('TestContainer', 'TestNetwork');
+
+        $this->assertEquals(true, $response);
     }
 
     /**
-     * @depends testnetworkConnect
+     * @depends testNetworkConnect
      */
-    public function testnetworkDisconnect(): void
+    public function testNetworkDisconnect(): void
     {
         $response = static::getOrchestration()->networkDisconnect('TestContainer', 'TestNetwork', true);
 
         $this->assertEquals(true, $response);
     }
 
     /**
-     * @depends testnetworkDisconnect
+     * @depends testNetworkDisconnect
      */
     public function testRemoveNetwork(): void
     {
@@ -272,7 +243,7 @@ public function testExecContainer(): void
          */
         $output = '';
 
-        $response = static::getOrchestration()->execute(
+        static::getOrchestration()->execute(
             'TestContainer',
             [
                 'php',
@@ -294,7 +265,7 @@ public function testCheckVolume(): void
     {
         $output = '';
 
-        $response = static::getOrchestration()->execute(
+        static::getOrchestration()->execute(
             'TestContainer',
             [
                 'cat',