Configure travis for MysqlStore

GromNaN · GromNaN · commit 4408fc609af0 · 2017-12-26T23:35:50.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -36,6 +36,7 @@ cache:
 services:
     - memcached
     - mongodb
+    - mysql
     - redis-server
 
 before_install:
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -19,6 +19,9 @@
         <env name="LDAP_PORT" value="3389" />
         <env name="REDIS_HOST" value="localhost" />
         <env name="MEMCACHED_HOST" value="localhost" />
+        <env name="MYSQL_HOST" value="127.0.0.1" />
+        <env name="MYSQL_USERNAME" value="root" />
+        <env name="MYSQL_PASSWORD" value="" />
     </php>
 
     <testsuites>
diff --git a/src/Symfony/Component/Lock/Store/MysqlStore.php b/src/Symfony/Component/Lock/Store/MysqlStore.php
@@ -26,7 +26,6 @@ class MysqlStore implements StoreInterface
     private $username;
     private $password;
     private $options;
-
     private $waitTimeout;
 
     /**
diff --git a/src/Symfony/Component/Lock/Tests/Store/MysqlStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/MysqlStoreTest.php
@@ -27,21 +27,17 @@ class MysqlStoreTest extends AbstractStoreTest
      */
     public function getStore()
     {
-        return new MysqlStore(getenv('MYSQL_DSN'), array(
-            'db_username' => getenv('MYSQL_USER'),
+        return new MysqlStore('mysql:host='.getenv('MYSQL_HOST'), array(
+            'db_username' => getenv('MYSQL_USERNAME'),
             'db_password' => getenv('MYSQL_PASSWORD'),
+            'wait_timeout' => 1,
         ));
     }
 
-    /**
-     * @medium
-     *
-     * @todo use phpunit/php-invoker to avoid infinite wait ?
-     */
     public function testConfigurableWaitTimeout()
     {
-        $store = new MysqlStore(getenv('MYSQL_DSN'), array(
-            'db_username' => getenv('MYSQL_USER'),
+        $store = new MysqlStore('mysql:host='.getenv('MYSQL_HOST'), array(
+            'db_username' => getenv('MYSQL_USERNAME'),
             'db_password' => getenv('MYSQL_PASSWORD'),
             'wait_timeout' => 1,
         ));
@@ -50,7 +46,7 @@ public function testConfigurableWaitTimeout()
         $key1 = new Key($resource);
         $key2 = new Key($resource);
 
-        $store->waitAndSave($key1);
+        $store->save($key1);
 
         $startTime = microtime(true);
 
diff --git a/src/Symfony/Component/Lock/phpunit.xml.dist b/src/Symfony/Component/Lock/phpunit.xml.dist
@@ -12,8 +12,8 @@
         <ini name="error_reporting" value="-1" />
         <env name="REDIS_HOST" value="localhost" />
         <env name="MEMCACHED_HOST" value="localhost" />
-        <env name="MYSQL_DSN" value="mysql:host=localhost" />
-        <env name="MYSQL_USER" value="root" />
+        <env name="MYSQL_HOST" value="127.0.0.1" />
+        <env name="MYSQL_USERNAME" value="root" />
         <env name="MYSQL_PASSWORD" value="" />
     </php>
 
