Travis testing fixes

Squashed commit of the following:

commit 17fb6798cd
Author: farcepest <farcepest@gmail.com>
Date:   Tue Oct 2 14:03:57 2012 -0400

    Add a build status widget for Travis

commit 1cd83ef78e
Author: farcepest <farcepest@gmail.com>
Date:   Tue Oct 2 13:59:48 2012 -0400

    Rewrite the repository root README

commit 72848c84bc
Author: farcepest <farcepest@gmail.com>
Date:   Tue Oct 2 13:50:00 2012 -0400

    Somehow I missed this connection setup

commit 413c3b6623
Author: 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)

commit 400112e0c3
Author: 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

commit ae94e44ed1
Author: farcepest <farcepest@gmail.com>
Date:   Tue Oct 2 12:59:29 2012 -0400

    Add Travis-specific configuration file

commit 3581603f45
Merge: f42c369 d0e96c7
Author: 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

commit f42c369300
Author: Andy Dustman <farcepest@gmail.com>
Date:   Mon Oct 1 13:43:00 2012 -0400

    Maybe a subshell will do the trick?

commit fb346e1d40
Author: 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

commit 2f661f0991
Author: Andy Dustman <farcepest@gmail.com>
Date:   Mon Oct 1 13:31:40 2012 -0400

    OK, this should hopefully fix the build process for Travis

commit 899c3342b2
Author: Andy Dustman <farcepest@gmail.com>
Date:   Mon Oct 1 13:28:14 2012 -0400

    More Travis fixes

commit 8f593def7b
Author: Andy Dustman <farcepest@gmail.com>
Date:   Mon Oct 1 13:19:39 2012 -0400

    Fix test script due to source being down one level.

commit 1936b93cf0
Author: Andy Dustman <farcepest@gmail.com>
Date:   Mon Oct 1 13:14:38 2012 -0400

    Test connection tweaks for Travis

commit 9bf8bcf894
Merge: 7ae4f55 d551f8a
Author: Andy Dustman <farcepest@gmail.com>
Date:   Mon Oct 1 13:10:58 2012 -0400

    Merge branch 'travis' into MySQLdb-1.2

commit d551f8a8d9
Author: Andy Dustman <farcepest@gmail.com>
Date:   Mon Oct 1 13:05:25 2012 -0400

    Initial Travis setup

commit 7ae4f5549b
Merge: 235d846 c16bc33
Author: 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

commit 235d8466dd
Author: farcepest <farcepest@gmail.com>
Date:   Thu Sep 27 12:18:07 2012 -0400

    History updates for 1.2.4b2

commit 5fda4c2579
Author: 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.

commit 048b70d901
Author: 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.

commit 162e9e4d84
Author: Andy Dustman <farcepest@gmail.com>
Date:   Tue Sep 25 19:56:49 2012 -0400

    General cleanups
This commit is contained in:
farcepest
2012-10-02 14:15:12 -04:00
parent d0e96c7155
commit a6dcb3b683
4 changed files with 21 additions and 3 deletions

8
.travis.yml Normal file
View 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)

View File

@@ -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

View File

@@ -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
View 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