Browse Source

Merge pull request #9832 from cakephp/fix-mysql

Attempt to fix the MySQL builds.
José Lorenzo Rodríguez 9 years ago
parent
commit
340223b042
2 changed files with 2 additions and 29 deletions
  1. 2 2
      .travis.yml
  2. 0 27
      tests/TestCase/Filesystem/FolderTest.php

+ 2 - 2
.travis.yml

@@ -10,7 +10,7 @@ dist: trusty
 
 
 env:
 env:
   matrix:
   matrix:
-    - DB=mysql db_dsn='mysql://root@0.0.0.0/cakephp_test'
+    - DB=mysql db_dsn='mysql://root@127.0.0.1/cakephp_test'
     - DB=pgsql db_dsn='postgres://postgres@127.0.0.1/cakephp_test'
     - DB=pgsql db_dsn='postgres://postgres@127.0.0.1/cakephp_test'
     - DB=sqlite db_dsn='sqlite:///:memory:'
     - DB=sqlite db_dsn='sqlite:///:memory:'
   global:
   global:
@@ -20,6 +20,7 @@ services:
   - memcached
   - memcached
   - redis-server
   - redis-server
   - postgresql
   - postgresql
+  - mysql
 
 
 addons:
 addons:
   postgresql: "9.4"
   postgresql: "9.4"
@@ -50,7 +51,6 @@ before_install:
 
 
   - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi;
   - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi;
 
 
-  - if [ $DB = 'mysql' ]; then sudo apt-get -y install mysql-server; fi
   - if [ $DB = 'mysql' ]; then mysql -u root -e 'CREATE DATABASE cakephp_test;'; fi
   - if [ $DB = 'mysql' ]; then mysql -u root -e 'CREATE DATABASE cakephp_test;'; fi
   - if [ $DB = 'mysql' ]; then mysql -u root -e 'CREATE DATABASE cakephp_test2;'; fi
   - if [ $DB = 'mysql' ]; then mysql -u root -e 'CREATE DATABASE cakephp_test2;'; fi
   - if [ $DB = 'mysql' ]; then mysql -u root -e 'CREATE DATABASE cakephp_test3;'; fi
   - if [ $DB = 'mysql' ]; then mysql -u root -e 'CREATE DATABASE cakephp_test3;'; fi

+ 0 - 27
tests/TestCase/Filesystem/FolderTest.php

@@ -1372,33 +1372,6 @@ class FolderTest extends TestCase
     }
     }
 
 
     /**
     /**
-     * testSortByTime2 method
-     *
-     * Verify that the order using modified time is correct.
-     *
-     * @return void
-     */
-    public function testSortByTime2()
-    {
-        $Folder = new Folder(TMP . 'tests', true);
-
-        $fileA = new File($Folder->pwd() . DS . 'a.txt');
-        $fileA->create();
-
-        $fileC = new File($Folder->pwd() . DS . 'c.txt');
-        $fileC->create();
-
-        sleep(1);
-
-        $fileB = new File($Folder->pwd() . DS . 'b.txt');
-        $fileB->create();
-
-        $results = $Folder->find('.*', Folder::SORT_TIME);
-
-        $this->assertSame(['a.txt', 'c.txt', 'b.txt'], $results);
-    }
-
-    /**
      * Verify that the order using name is correct.
      * Verify that the order using name is correct.
      */
      */
     public function testSortByName()
     public function testSortByName()