From 7e80f6821db1b29441d540f2d83d919a203d787b Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Sun, 21 Aug 2016 20:17:49 +0200
Subject: [PATCH 1/2] use trusty for testing, to have a recent FUSE

---
 .travis.yml        | 3 +++
 .travis/install.sh | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 0ec266edd..c46fc6f56 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,12 +10,15 @@ matrix:
     include:
         - python: 3.4
           os: linux
+          dist: trusty
           env: TOXENV=py34
         - python: 3.5
           os: linux
+          dist: trusty
           env: TOXENV=py35
         - python: 3.5
           os: linux
+          dist: trusty
           env: TOXENV=flake8
         - language: generic
           os: osx
diff --git a/.travis/install.sh b/.travis/install.sh
index 73e292ddd..6ebbbfed4 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -31,7 +31,6 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then
     python -m pip install --user 'virtualenv<14.0'
 else
     pip install 'virtualenv<14.0'
-    sudo add-apt-repository -y ppa:gezakovacs/lz4
     sudo apt-get update
     sudo apt-get install -y liblz4-dev
     sudo apt-get install -y libacl1-dev

From 32bd29548bcbb9267546cf93ffba76871b25cca9 Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Sun, 21 Aug 2016 19:27:23 +0200
Subject: [PATCH 2/2] travis: test fuse-enabled borg

---
 .travis/install.sh | 5 ++++-
 tox.ini            | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.travis/install.sh b/.travis/install.sh
index 6ebbbfed4..64ccd5a24 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -16,6 +16,8 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then
 
     brew install lz4
     brew outdated pyenv || brew upgrade pyenv
+    brew install pkg-config
+    brew install Caskroom/versions/osxfuse-beta
 
     case "${TOXENV}" in
         py34)
@@ -34,10 +36,11 @@ else
     sudo apt-get update
     sudo apt-get install -y liblz4-dev
     sudo apt-get install -y libacl1-dev
+    sudo apt-get install -y libfuse-dev fuse pkg-config  # optional, for FUSE support
 fi
 
 python -m virtualenv ~/.venv
 source ~/.venv/bin/activate
 pip install -r requirements.d/development.txt
 pip install codecov
-pip install -e .
+pip install -e .[fuse]
diff --git a/tox.ini b/tox.ini
index bc6195d93..699ef251a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,7 +11,8 @@ changedir = {toxworkdir}
 deps =
      -rrequirements.d/development.txt
      -rrequirements.d/attic.txt
-commands = py.test --cov=borg --cov-config=../.coveragerc --benchmark-skip --pyargs {posargs:borg.testsuite}
+     -rrequirements.d/fuse.txt
+commands = py.test -rs --cov=borg --cov-config=../.coveragerc --benchmark-skip --pyargs {posargs:borg.testsuite}
 # fakeroot -u needs some env vars:
 passenv = *