From f7bbff4cece5401e4291a2ba5f92a1869cf1a7d5 Mon Sep 17 00:00:00 2001
From: kakwa <carpentier.pf@gmail.com>
Date: Fri, 17 Jun 2016 00:15:14 +0200
Subject: [PATCH] trying to cleanup travis build env

---
 .travis.yml              | 22 +++++++++-------------
 tests/test_env/deploy.sh | 14 --------------
 2 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e8e38c8..44d23e8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,30 +1,26 @@
+sudo: required
+dist: trusty
+language: python
+
 env:
   - TRAVIS="yes"
 
 before_install:
-  - '[ "$TEST_PEP8" == "1" ] || curl https://ftp-master.debian.org/keys/archive-key-7.0.asc | sudo apt-key add -'
-  - '[ "$TEST_PEP8" == "1" ] || echo "deb http://http.debian.net/debian wheezy-backports main" | sudo tee -a /etc/apt/sources.list'
-  - '[ "$TEST_PEP8" == "1" ] || echo "deb http://http.debian.net/debian wheezy main" | sudo tee -a /etc/apt/sources.list'
-  - '[ "$TEST_PEP8" == "1" ] || sudo /sbin/ifconfig'
-  - '[ "$TEST_PEP8" == "1" ] || sudo apt-get update -qq'
-  - '[ "$TEST_PEP8" == "1" ] || sudo rm /etc/dpkg/dpkg.cfg.d/multiarch'
   - '[ "$TEST_PEP8" == "1" ] || sudo ./tests/test_env/deploy.sh'
 
-language: python
 python:
   - "2.7"
-#  - "3.2"
-#  - "3.3"
-# command to install dependencies
+
 install: 
   - pip install -e .
   - "if [[ $TEST_PEP8 == '1' ]]; then pip install pep8; fi"
   - pip install passlib
   - pip install coveralls
+
 # command to run tests
-script: 
-  - coverage run --source=ldapcherry setup.py test
-  - "if [[ $TEST_HIREDIS == '1' ]]; then pip install hiredis; fi"
+#
+#script: 
+#  - coverage run --source=ldapcherry setup.py test
 script: "if [[ $TEST_PEP8 == '1' ]]; then pep8 --repeat --show-source --exclude=.venv,.tox,dist,docs,build,*.egg,tests,misc . scripts/ldapcherryd; else coverage run --source=ldapcherry setup.py test; fi"
 matrix:
   include:
diff --git a/tests/test_env/deploy.sh b/tests/test_env/deploy.sh
index 996460c..631a27b 100755
--- a/tests/test_env/deploy.sh
+++ b/tests/test_env/deploy.sh
@@ -6,20 +6,6 @@ then
   DEBIAN_FRONTEND=noninteractive apt-get install kpartx -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold"  -f -q -y
   DEBIAN_FRONTEND=noninteractive apt-get install lsb-base libattr1 -t wheezy -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold"  -f -q -y
   DEBIAN_FRONTEND=noninteractive apt-get install samba python-samba samba-vfs-modules -t wheezy-backports -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold"  -f -q -y
-  truncate -s 512M file.img
-  fdisk file.img <<EOF
-n
-p
-1
-
-
-
-w
-q
-EOF
-  kpartx -a file.img
-  mkfs.ext4 /dev/mapper/loop0p1
-  mount /dev/mapper/loop0p1 /var/lib/samba/
 else
   DEBIAN_FRONTEND=noninteractive apt-get install ldap-utils slapd samba python-samba samba-vfs-modules -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold"  -f -q -y
 fi