summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Dustman <farcepest@gmail.com>2012-10-01 13:14:38 -0400
committerAndy Dustman <farcepest@gmail.com>2012-10-01 13:14:38 -0400
commit1936b93cf05497450a3d99819dab7a645c157299 (patch)
treec8a50f3f3b92904f11379ffe850f6fb4febfa466
parent9bf8bcf894b98784e3787c9d6a57574a4ae8dced (diff)
downloadmysqldb1-1936b93cf05497450a3d99819dab7a645c157299.tar.gz
Test connection tweaks for Travis
-rw-r--r--.travis.yml2
-rw-r--r--MySQLdb/tests/test_MySQLdb_capabilities.py2
-rw-r--r--MySQLdb/tests/test_MySQLdb_dbapi20.py2
-rw-r--r--MySQLdb/tests/test_MySQLdb_nonstandard.py2
4 files changed, 3 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 2fc25ce..fa36a94 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,5 +5,3 @@ Python:
- "2.6"
- "2.7"
script: nosetests
-before_script:
- - mysql -e 'CREATE DATABASE test;'
diff --git a/MySQLdb/tests/test_MySQLdb_capabilities.py b/MySQLdb/tests/test_MySQLdb_capabilities.py
index a510468..c4b3a73 100644
--- a/MySQLdb/tests/test_MySQLdb_capabilities.py
+++ b/MySQLdb/tests/test_MySQLdb_capabilities.py
@@ -10,7 +10,7 @@ class test_MySQLdb(capabilities.DatabaseTest):
db_module = MySQLdb
connect_args = ()
- connect_kwargs = dict(db='test', host="127.0.0.1", user="test", #read_default_file='~/.my.cnf',
+ connect_kwargs = dict(db='test', host="127.0.0.1", user="root",
charset='utf8', sql_mode="ANSI,STRICT_TRANS_TABLES,TRADITIONAL")
create_table_extra = "ENGINE=INNODB CHARACTER SET UTF8"
leak_test = False
diff --git a/MySQLdb/tests/test_MySQLdb_dbapi20.py b/MySQLdb/tests/test_MySQLdb_dbapi20.py
index 4f4527a..a8441bd 100644
--- a/MySQLdb/tests/test_MySQLdb_dbapi20.py
+++ b/MySQLdb/tests/test_MySQLdb_dbapi20.py
@@ -8,7 +8,7 @@ class test_MySQLdb(dbapi20.DatabaseAPI20Test):
connect_args = ()
connect_kw_args = dict(db='test',
host="127.0.0.1",
- user="test", #read_default_file='~/.my.cnf',
+ user="root",
charset='utf8',
sql_mode="ANSI,STRICT_TRANS_TABLES,TRADITIONAL")
diff --git a/MySQLdb/tests/test_MySQLdb_nonstandard.py b/MySQLdb/tests/test_MySQLdb_nonstandard.py
index 150d013..b9b127e 100644
--- a/MySQLdb/tests/test_MySQLdb_nonstandard.py
+++ b/MySQLdb/tests/test_MySQLdb_nonstandard.py
@@ -44,7 +44,7 @@ class CoreAPI(unittest.TestCase):
"""Test _mysql interaction internals."""
def setUp(self):
- self.conn = _mysql.connect(db='test', host='127.0.0.1', user='test') #read_default_file="~/.my.cnf")
+ self.conn = _mysql.connect(db='test', host='127.0.0.1', user='root')
def tearDown(self):
self.conn.close()