From ffd32d38f82a321f4f7b433289d02455a50bafe8 Mon Sep 17 00:00:00 2001
From: Chris PeBenito <cpebenito@tresys.com>
Date: Mon, 6 Apr 2015 10:07:22 -0400
Subject: [PATCH] Add lint to CI.  Step back to single coverage test, on Python
 3.3.

I decided kamino's original single-coverage tox.ini was better.
---
 .travis.yml | 10 ++++++----
 tox.ini     | 22 ++--------------------
 2 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5717704..9d58ae9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,10 +5,12 @@
 language: python
 
 env:
-  - TOX_ENV=py27-coverage
-  - TOX_ENV=py33-coverage
-  - TOX_ENV=py34-coverage
+  - TOX_ENV=py27
+  - TOX_ENV=py33
+  - TOX_ENV=py34
   - TOX_ENV=pep8
+  - TOX_ENV=coverage
+  - TOX_ENV=lint
 
 before_install:
   - lsb_release -a
@@ -36,7 +38,7 @@ before_install:
   - sed 's/ln -sf --relative /ln -sf /' -i selinux-src/libsepol/src/Makefile
   - sed 's/ln -sf --relative /ln -sf /' -i selinux-src/libselinux/src/Makefile
 
-  # Drop sepolicy to break setools dependence (sepolicy isn't used anyway)
+  # Drop sepolicy to break setools3 dependence (sepolicy isn't used here anyway)
   - sed -i -e 's/sepolicy//' selinux-src/policycoreutils/Makefile
 
   # Compile and install SELinux toolchain
diff --git a/tox.ini b/tox.ini
index 69f181c..a3c8358 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,19 +9,9 @@ max-line-length = 100
 [testenv:pep8]
 deps            = pep8
 commands        = pep8 --version
-                  pep8 setools/ tests/ seinfo seinfoflow sedta sesearch --statistics -v
+                  pep8 setools/ tests/ seinfo seinfoflow sedta sesearch --statistics
 
-[testenv:py27-coverage]
-basepython      = python2.7
-deps            = networkx==1.9
-                  mock
-                  coverage
-commands        = coverage --version
-                  coverage erase
-                  coverage run setup.py test
-                  coverage report
-
-[testenv:py33-coverage]
+[testenv:coverage]
 basepython      = python3.3
 deps            = networkx==1.9
                   coverage
@@ -30,14 +20,6 @@ commands        = coverage --version
                   coverage run setup.py test
                   coverage report
 
-[testenv:py34-coverage]
-basepython      = python3.4
-deps            = networkx==1.9
-                  coverage
-commands        = coverage --version
-                  coverage erase
-                  coverage run setup.py test
-                  coverage report
 [testenv:lint]
 deps            = pylint
                   networkx==1.9