mirror of
https://github.com/PyMySQL/mysqlclient.git
synced 2026-03-13 08:00:02 +08:00
Travis testing fixes
Squashed commit of the following: commit17fb6798cdAuthor: farcepest <farcepest@gmail.com> Date: Tue Oct 2 14:03:57 2012 -0400 Add a build status widget for Travis commit1cd83ef78eAuthor: farcepest <farcepest@gmail.com> Date: Tue Oct 2 13:59:48 2012 -0400 Rewrite the repository root README commit72848c84bcAuthor: farcepest <farcepest@gmail.com> Date: Tue Oct 2 13:50:00 2012 -0400 Somehow I missed this connection setup commit413c3b6623Author: farcepest <farcepest@gmail.com> Date: Tue Oct 2 13:19:09 2012 -0400 Giving Travis it's own database with utf8 charset in hopes this will fix the callproc test (which works everywhere else) commit400112e0c3Author: farcepest <farcepest@gmail.com> Date: Tue Oct 2 13:06:00 2012 -0400 Update the Travis config so that the tests use the correct database configuration file commitae94e44ed1Author: farcepest <farcepest@gmail.com> Date: Tue Oct 2 12:59:29 2012 -0400 Add Travis-specific configuration file commit3581603f45Merge:f42c369d0e96c7Author: farcepest <farcepest@gmail.com> Date: Tue Oct 2 12:58:00 2012 -0400 Merge branch 'master' into MySQLdb-1.2 Conflicts: MySQLdb/tests/test_MySQLdb_capabilities.py MySQLdb/tests/test_MySQLdb_dbapi20.py commitf42c369300Author: Andy Dustman <farcepest@gmail.com> Date: Mon Oct 1 13:43:00 2012 -0400 Maybe a subshell will do the trick? commitfb346e1d40Author: Andy Dustman <farcepest@gmail.com> Date: Mon Oct 1 13:35:50 2012 -0400 Travis can't build for Python 2.4 it seems, and the test still weren't all running commit2f661f0991Author: Andy Dustman <farcepest@gmail.com> Date: Mon Oct 1 13:31:40 2012 -0400 OK, this should hopefully fix the build process for Travis commit899c3342b2Author: Andy Dustman <farcepest@gmail.com> Date: Mon Oct 1 13:28:14 2012 -0400 More Travis fixes commit8f593def7bAuthor: Andy Dustman <farcepest@gmail.com> Date: Mon Oct 1 13:19:39 2012 -0400 Fix test script due to source being down one level. commit1936b93cf0Author: Andy Dustman <farcepest@gmail.com> Date: Mon Oct 1 13:14:38 2012 -0400 Test connection tweaks for Travis commit9bf8bcf894Merge:7ae4f55d551f8aAuthor: Andy Dustman <farcepest@gmail.com> Date: Mon Oct 1 13:10:58 2012 -0400 Merge branch 'travis' into MySQLdb-1.2 commitd551f8a8d9Author: Andy Dustman <farcepest@gmail.com> Date: Mon Oct 1 13:05:25 2012 -0400 Initial Travis setup commit7ae4f5549bMerge:235d846c16bc33Author: farcepest <farcepest@gmail.com> Date: Thu Sep 27 12:49:07 2012 -0400 Merge remote-tracking branch 'origin/MySQLdb-1.2' into MySQLdb-1.2 commit235d8466ddAuthor: farcepest <farcepest@gmail.com> Date: Thu Sep 27 12:18:07 2012 -0400 History updates for 1.2.4b2 commit5fda4c2579Author: farcepest <farcepest@gmail.com> Date: Thu Sep 27 12:06:58 2012 -0400 Revert raise exc as value statements to raise exc, value since it breaks Python < 2.6. commit048b70d901Author: farcepest <farcepest@gmail.com> Date: Wed Sep 26 16:02:05 2012 -0400 Fix MySQLdb1-1 Exception format incompatible with previous versions Unfortunately, when I broke this, I broke the test at the same time. That should have been a red flag. commit162e9e4d84Author: Andy Dustman <farcepest@gmail.com> Date: Tue Sep 25 19:56:49 2012 -0400 General cleanups
This commit is contained in:
8
.travis.yml
Normal file
8
.travis.yml
Normal file
@@ -0,0 +1,8 @@
|
||||
language: python
|
||||
python:
|
||||
- "2.5"
|
||||
- "2.6"
|
||||
- "2.7"
|
||||
install: (cd MySQLdb && python setup.py install)
|
||||
before_script: mysql -e 'create database mysqldb_test charset utf8;'
|
||||
script: (cd MySQLdb && TESTDB=travis.cnf nosetests)
|
||||
@@ -8,7 +8,6 @@
|
||||
from time import time
|
||||
import array
|
||||
import unittest
|
||||
from configdb import connection_factory
|
||||
|
||||
|
||||
class DatabaseTest(unittest.TestCase):
|
||||
@@ -22,7 +21,7 @@ class DatabaseTest(unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
import gc
|
||||
db = connection_factory(**self.connect_kwargs)
|
||||
db = self.db_module.connect(*self.connect_args, **self.connect_kwargs)
|
||||
self.connection = db
|
||||
self.cursor = db.cursor()
|
||||
# TODO: this needs to be re-evaluated for Python 3
|
||||
|
||||
@@ -3,6 +3,7 @@ import unittest
|
||||
import _mysql
|
||||
import MySQLdb
|
||||
from MySQLdb.constants import FIELD_TYPE
|
||||
from configdb import connection_factory
|
||||
|
||||
|
||||
class TestDBAPISet(unittest.TestCase):
|
||||
@@ -44,7 +45,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 = connection_factory(use_unicode=True)
|
||||
|
||||
def tearDown(self):
|
||||
self.conn.close()
|
||||
|
||||
10
MySQLdb/tests/travis.cnf
Normal file
10
MySQLdb/tests/travis.cnf
Normal file
@@ -0,0 +1,10 @@
|
||||
# To create your own custom version of this file, read
|
||||
# http://dev.mysql.com/doc/refman/5.1/en/option-files.html
|
||||
# and set TESTDB in your environment to the name of the file
|
||||
|
||||
[MySQLdb-tests]
|
||||
host = 127.0.0.1
|
||||
user = root
|
||||
database = mysqldb_test
|
||||
#password =
|
||||
default-character-set = utf8
|
||||
Reference in New Issue
Block a user