diff options
| author | Andy Dustman <farcepest@gmail.com> | 2012-10-01 11:45:25 -0700 |
|---|---|---|
| committer | Andy Dustman <farcepest@gmail.com> | 2012-10-01 11:45:25 -0700 |
| commit | 02d94c48ff2d957330f1a4817613628a8e0427a0 (patch) | |
| tree | 9b7fde061c2b804738b93bfb842ff5cea48bcec5 | |
| parent | 4af9b70b91903f788207e7b7bbb28676862c1b5a (diff) | |
| parent | f42c369300c856c2bbcc440cd68286bca7a93be8 (diff) | |
| download | mysqldb1-02d94c48ff2d957330f1a4817613628a8e0427a0.tar.gz | |
Merge pull request #2 from farcepest/MySQLdb-1.2
Add Travis support
| -rw-r--r-- | .travis.yml | 7 | ||||
| -rw-r--r-- | MySQLdb/tests/test_MySQLdb_capabilities.py | 2 | ||||
| -rw-r--r-- | MySQLdb/tests/test_MySQLdb_dbapi20.py | 2 | ||||
| -rw-r--r-- | MySQLdb/tests/test_MySQLdb_nonstandard.py | 2 |
4 files changed, 10 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..d35257b --- /dev/null +++ b/.travis.yml @@ -0,0 +1,7 @@ +language: python +python: + - "2.5" + - "2.6" + - "2.7" +install: (cd MySQLdb && python setup.py install) +script: (cd MySQLdb && nosetests) 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() |