mrg from master

srlindsay · Aug 27, 2015 · 4d4b012 · 4d4b012
2 parents c2d9167 + 662fbf4
commit 4d4b012
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 3 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -0,0 +1,16 @@
+[run]
+branch = True
+source =
+    pymysql
+
+
+[report]
+exclude_lines =
+    pragma: no cover
+    except ImportError:
+    if DEBUG:
+    def __repr__
+    def __str__
+    raise NotImplementedError
+    def __getattr__
+    raise ValueError
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 *.pyc
 *.pyo
 __pycache__
+.coverage
 /dist
 /PyMySQL.egg-info
 /.tox

diff --git a/.travis.yml b/.travis.yml
@@ -55,7 +55,7 @@ matrix:
 # really only need libaio1 for DB builds however libaio-dev is whitelisted for container builds and liaio1 isn't
 
 install:
-    - pip install -U tox
+    - pip install -U tox coveralls
 
 before_script:
     - ./.travis.initialize.db.sh;
@@ -65,9 +65,13 @@ before_script:
     - mysql -u root -e "create user travis_pymysql2@localhost identified by 'some password'; grant all on test_pymysql2.* to travis_pymysql2@localhost;"
     - mysql -e 'select VERSION();'
     - rm -f ~/.my.cnf # set in .travis.initialize.db.sh for the above commands - we should be using database.json however
+    - export COVERALLS_PARALLEL=true
 
 script:
     - tox -e $TOX_ENV
 
+after_success:
+    - coveralls
+
 after_failure:
     - cat /tmp/mysql.err
diff --git a/README.rst b/README.rst
@@ -5,6 +5,8 @@ PyMySQL
 .. image:: https://travis-ci.org/PyMySQL/PyMySQL.svg?branch=master
    :target: https://travis-ci.org/PyMySQL/PyMySQL
 
+.. image:: https://coveralls.io/repos/PyMySQL/PyMySQL/badge.svg?branch=coveralls&service=github :target: https://coveralls.io/github/PyMySQL/PyMySQL?branch=coveralls
+
 .. contents::
 
 This package contains a pure-Python MySQL client library. The goal of PyMySQL

diff --git a/pymysql/connections.py b/pymysql/connections.py
@@ -107,7 +107,7 @@ def _makefile(sock, mode):
 MAX_PACKET_LEN = 2**24-1
 
 
-def dump_packet(data):
+def dump_packet(data): # pragma: no cover
     def is_ascii(data):
         if 65 <= byte2int(data) <= 122:
             if isinstance(data, int):

diff --git a/tox.ini b/tox.ini
@@ -2,5 +2,6 @@
 envlist = py26,py27,py33,py34,pypy,pypy3
 
 [testenv]
-commands = ./runtests.py
+commands = coverage run ./runtests.py
 deps = unittest2
+       coverage