Merge pull request PyMySQL#459 from methane/travis-confs

methane · methane · commit 31e7d7b11bb8 · 2016-05-17T20:54:11.000+09:00
Reduce top level files for travis
diff --git a/.travis.yml b/.travis.yml
@@ -79,7 +79,7 @@ install:
     - pip install -U tox coveralls
 
 before_script:
-    - ./.travis.initialize.db.sh;
+    - ./.travis/initializedb.sh
     - mysql -e 'create database test_pymysql  DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci;'
     - mysql -e 'create database test_pymysql2 DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci;'
     - mysql -u root -e "create user travis_pymysql2 identified by 'some password'; grant all on test_pymysql2.* to travis_pymysql2;"
diff --git a/.travis/database.json b/.travis/database.json
diff --git a/.travis/initializedb.sh b/.travis/initializedb.sh
@@ -44,8 +44,8 @@ if [ ! -z "${DB}" ]; then
         ${P}/bin/mysql -S /tmp/mysql.sock -u root -p"${PASSWD}" --connect-expired-password -e "SET PASSWORD = PASSWORD('')"
     fi
     mysql -S /tmp/mysql.sock -u root -e "create user ${USER}@localhost; create user ${USER}@'%'; grant all on *.* to  ${USER}@localhost WITH GRANT OPTION;grant all on *.* to  ${USER}@'%' WITH GRANT OPTION;"
-    sed -e 's/3306/3307/g' -e 's:/var/run/mysqld/mysqld.sock:/tmp/mysql.sock:g' .travis.databases.json > pymysql/tests/databases.json
+    sed -e 's/3306/3307/g' -e 's:/var/run/mysqld/mysqld.sock:/tmp/mysql.sock:g' .travis/database.json > pymysql/tests/databases.json
     echo -e "[client]\nsocket = /tmp/mysql.sock\n" > "${HOME}"/.my.cnf
 else
-    cp .travis.databases.json pymysql/tests/databases.json
+    cp .travis/database.json pymysql/tests/databases.json
 fi
