From: Loic Dachary <ldachary@redhat.com>
Date: Mon, 26 Oct 2015 23:10:59 +0000 (+0900)
Subject: openstack: tests: look in caplog
X-Git-Tag: 1.1.0~778^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F672%2Fhead;p=teuthology.git

openstack: tests: look in caplog

The output is now logged, use caplog instead of capsys and add it as a
test dependency.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
---

diff --git a/teuthology/openstack/test/test_openstack.py b/teuthology/openstack/test/test_openstack.py
index 33d1679a0..ac68d1453 100644
--- a/teuthology/openstack/test/test_openstack.py
+++ b/teuthology/openstack/test/test_openstack.py
@@ -131,7 +131,7 @@ openstack keypair delete {key_name} || true
         """.format(key_name=self.key_name,
                    name=self.name))
 
-    def test_create(self, capsys):
+    def test_create(self, caplog):
         teuthology_argv = [
             '--suite', 'upgrade/hammer',
             '--dry-run',
@@ -168,8 +168,7 @@ openstack keypair delete {key_name} || true
         assert "clone=git clone" in variables
         assert os.environ['OS_AUTH_URL'] in variables
 
-        out, err = capsys.readouterr()
-        assert " ".join(teuthology_argv) in out
+        assert " ".join(teuthology_argv) in caplog.text()
 
         if self.can_create_floating_ips:
             ip = teuthology.get_floating_ip(self.name)
diff --git a/tox.ini b/tox.ini
index 0d1d89ccf..4715a7ad0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -53,6 +53,7 @@ sitepackages=True
 deps=
   -r{toxinidir}/requirements.txt
   mock
+  pytest-capturelog
 
 commands=py.test -v {posargs:teuthology/openstack/test/test_openstack.py}
 basepython=python2.7