From 19b6c8995ded99f1513a25255e99a5d238d11e72 Mon Sep 17 00:00:00 2001
From: Davanum Srinivas <davanum@gmail.com>
Date: Wed, 5 Jul 2017 10:25:55 -0400
Subject: [PATCH] Use py.test instead of nosetests for better problem reporting

nosetests output is not very useful for diagnosing issues when
running in travis. Let us switch to py.test
---
 test-requirements.txt | 1 +
 tox.ini               | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/test-requirements.txt b/test-requirements.txt
index 2b831e10ae..e18c5c27d4 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,5 +1,6 @@
 coverage>=4.0.3
 nose>=1.3.7
+pytest
 pluggy>=0.3.1
 py>=1.4.31
 randomize>=0.13
diff --git a/tox.ini b/tox.ini
index 9a10395bae..307b6e87f0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,7 +9,7 @@ deps = -r{toxinidir}/test-requirements.txt
        -r{toxinidir}/requirements.txt
 commands =
    python -V
-   nosetests -e e2e -v
+   py.test -vvv -s --ignore=kubernetes/e2e_test
 
 [testenv:docs]
 commands =
@@ -22,17 +22,17 @@ commands =
 [testenv:py27-functional]
 commands =
    python -V
-   {toxinidir}/scripts/kube-init.sh nosetests -v []
+   {toxinidir}/scripts/kube-init.sh py.test -vvv -s []
 
 [testenv:py35-functional]
 commands =
    python -V
-   {toxinidir}/scripts/kube-init.sh nosetests -v []
+   {toxinidir}/scripts/kube-init.sh py.test -vvv -s []
 
 [testenv:py36-functional]
 commands =
    python -V
-   {toxinidir}/scripts/kube-init.sh nosetests -v []
+   {toxinidir}/scripts/kube-init.sh py.test -vvv -s []
 
 [testenv:coverage]
 commands =