Execute docker dependent tests with github actions

symfony · May 4, 2020 · a270c64 · a270c64
1 parent 751b1e0
commit a270c64
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/Tests/Store/MemcachedStoreTest.php b/Tests/Store/MemcachedStoreTest.php
@@ -19,6 +19,7 @@
  * @author Jérémy Derussé <[email protected]>
  *
  * @requires extension memcached
+ * @group integration
  */
 class MemcachedStoreTest extends AbstractStoreTest
 {

diff --git a/Tests/Store/PredisStoreTest.php b/Tests/Store/PredisStoreTest.php
@@ -13,6 +13,7 @@
 
 /**
  * @author Jérémy Derussé <[email protected]>
+ * @group integration
  */
 class PredisStoreTest extends AbstractRedisStoreTest
 {

diff --git a/Tests/Store/RedisArrayStoreTest.php b/Tests/Store/RedisArrayStoreTest.php
@@ -15,6 +15,7 @@
  * @author Jérémy Derussé <[email protected]>
  *
  * @requires extension redis
+ * @group integration
  */
 class RedisArrayStoreTest extends AbstractRedisStoreTest
 {
@@ -23,9 +24,10 @@ public static function setUpBeforeClass(): void
         if (!class_exists('RedisArray')) {
             self::markTestSkipped('The RedisArray class is required.');
         }
-        if (!@((new \Redis())->connect(getenv('REDIS_HOST')))) {
-            $e = error_get_last();
-            self::markTestSkipped($e['message']);
+        try {
+            (new \Redis())->connect(getenv('REDIS_HOST'));
+        } catch (\Exception $e) {
+            self::markTestSkipped($e->getMessage());
         }
     }
 

diff --git a/Tests/Store/RedisClusterStoreTest.php b/Tests/Store/RedisClusterStoreTest.php
@@ -15,6 +15,7 @@
  * @author Jérémy Derussé <[email protected]>
  *
  * @requires extension redis
+ * @group integration
  */
 class RedisClusterStoreTest extends AbstractRedisStoreTest
 {

diff --git a/Tests/Store/RedisStoreTest.php b/Tests/Store/RedisStoreTest.php
@@ -17,14 +17,16 @@
  * @author Jérémy Derussé <[email protected]>
  *
  * @requires extension redis
+ * @group integration
  */
 class RedisStoreTest extends AbstractRedisStoreTest
 {
     public static function setUpBeforeClass(): void
     {
-        if (!@((new \Redis())->connect(getenv('REDIS_HOST')))) {
-            $e = error_get_last();
-            self::markTestSkipped($e['message']);
+        try {
+            (new \Redis())->connect(getenv('REDIS_HOST'));
+        } catch (\Exception $e) {
+            self::markTestSkipped($e->getMessage());
         }
     }