From 5864bd76ebc2985f82fd49d69aa58895cb0698a8 Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Sat, 8 Aug 2015 01:55:46 +0200
Subject: [PATCH] fix test coverage / codecov.io, use xcode6.4

---
 .coveragerc                    | 13 +++++++++++++
 .gitignore                     |  1 +
 .travis.yml                    |  6 +++---
 .travis/install.sh             |  2 +-
 .travis/upload_coverage.sh     |  3 ++-
 requirements.d/development.txt |  1 +
 tox.ini                        |  2 +-
 7 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 .coveragerc

diff --git a/.coveragerc b/.coveragerc
new file mode 100644
index 000000000..9056361b9
--- /dev/null
+++ b/.coveragerc
@@ -0,0 +1,13 @@
+[run]
+branch = True
+source = borg
+
+[report]
+exclude_lines =
+    pragma: no cover
+    def __repr__
+    raise AssertionError
+    raise NotImplementedError
+    if 0:
+    if __name__ == .__main__.:
+ignore_errors = True
diff --git a/.gitignore b/.gitignore
index f3564a429..97df7c610 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ docs/usage/*.inc
 borg.build/
 borg.dist/
 borg.exe
+.coverage
diff --git a/.travis.yml b/.travis.yml
index 89fdbbff1..497bc7c04 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,15 +19,15 @@ matrix:
           env: TOXENV=py34
         - language: generic
           os: osx
-          osx_image: beta-xcode6.3
+          osx_image: xcode6.4
           env: TOXENV=py32
         - language: generic
           os: osx
-          osx_image: beta-xcode6.3
+          osx_image: xcode6.4
           env: TOXENV=py33
         - language: generic
           os: osx
-          osx_image: beta-xcode6.3
+          osx_image: xcode6.4
           env: TOXENV=py34
 
 install:
diff --git a/.travis/install.sh b/.travis/install.sh
index 21ff76000..80b39226f 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -39,5 +39,5 @@ fi
 
 python -m virtualenv ~/.venv
 source ~/.venv/bin/activate
-pip install tox pytest codecov Cython
+pip install tox pytest pytest-cov codecov Cython
 pip install -e .
diff --git a/.travis/upload_coverage.sh b/.travis/upload_coverage.sh
index 73584acfb..c2aa91bd2 100755
--- a/.travis/upload_coverage.sh
+++ b/.travis/upload_coverage.sh
@@ -6,5 +6,6 @@ set -x
 NO_COVERAGE_TOXENVS=(pep8)
 if ! [[ "${NO_COVERAGE_TOXENVS[*]}" =~ "${TOXENV}" ]]; then
     source ~/.venv/bin/activate
-    bash <(curl -s https://codecov.io/bash) -e TRAVIS_OS_NAME,TOXENV
+    ln .tox/.coverage .coverage
+    codecov -e TRAVIS_OS_NAME,TOXENV
 fi
diff --git a/requirements.d/development.txt b/requirements.d/development.txt
index 6d2928a92..37677a00f 100644
--- a/requirements.d/development.txt
+++ b/requirements.d/development.txt
@@ -1,4 +1,5 @@
 tox
 mock
 pytest
+pytest-cov<2.0.0
 Cython
diff --git a/tox.ini b/tox.ini
index c1a9e019f..a120a237a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,6 +9,6 @@ envlist = py32, py33, py34
 # not really matter, should be just different from the toplevel dir.
 changedir = {toxworkdir}
 deps = -rrequirements.d/development.txt
-commands = py.test --pyargs {posargs:borg.testsuite}
+commands = py.test --cov=borg --pyargs {posargs:borg.testsuite}
 # fakeroot -u needs some env vars:
 passenv = *