Drop pytest-capturelog

It's apparently been replaced by the built-in pytest-catchlog, which has
a very slightly different API.

Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit 939998627e941c2aa06faefae6287dc08e3a0efe)

diff --git a/teuthology/openstack/test/test_openstack.py b/teuthology/openstack/test/test_openstack.py
index 6140957e6cc4d35bc54cb52cfae3fbb45e2bbb04..df38d63c8820a09765dda000c998c1af2644e09c 100644 (file)
--- a/teuthology/openstack/test/test_openstack.py
+++ b/teuthology/openstack/test/test_openstack.py
@@ -450,7 +450,7 @@ openstack keypair delete {key_name} || true
         teuthology.main()
         assert 0 == teuthology.ssh("lsb_release -a")
         assert 0 == teuthology.ssh("grep 'substituded variables' /var/log/cloud-init.log")
-        l = caplog.text()
+        l = caplog.text
         assert 'Ubuntu 14.04' in l
         assert "nworkers=" + str(args.simultaneous_jobs) in l
         assert "username=" + teuthology.username in l

diff --git a/teuthology/orchestra/test/integration/test_integration.py b/teuthology/orchestra/test/integration/test_integration.py
index 90200a2a5c26cac34236b2ed523d4d1659f9e247..804def3b629ac61de20a25f019773de91d483acb 100644 (file)
--- a/teuthology/orchestra/test/integration/test_integration.py
+++ b/teuthology/orchestra/test/integration/test_integration.py
@@ -86,7 +86,7 @@ class TestIntegration():
         rem = remote.Remote(HOST)
         interval = 3
         rem.run(args="echo before; sleep %s; echo after" % interval)
-        for record in caplog.records():
+        for record in caplog.records:
             if record.msg == 'before':
                 before_time = record.created
             elif record.msg == 'after':

diff --git a/teuthology/suite/test/test_init.py b/teuthology/suite/test/test_init.py
index 5f13b6ec7cdc281c1b0152ee090f5224c06af226..7080d74c6c01ebde0982c02543a216ae73b1677a 100644 (file)
--- a/teuthology/suite/test/test_init.py
+++ b/teuthology/suite/test/test_init.py
@@ -78,13 +78,13 @@ def test_wait_success(m_get_jobs, caplog):
     assert 0 == suite.wait('name', 1, 'http://UPLOAD_URL')
     assert m_get_jobs.called_with('name', fields=['job_id', 'status'])
     assert 0 == len(in_progress)
-    assert 'fail http://UPLOAD_URL/name/2' in caplog.text()
+    assert 'fail http://UPLOAD_URL/name/2' in caplog.text
 
     in_progress = deepcopy(results)
     assert 0 == suite.wait('name', 1, None)
     assert m_get_jobs.called_with('name', fields=['job_id', 'status'])
     assert 0 == len(in_progress)
-    assert 'fail http://URL2' in caplog.text()
+    assert 'fail http://URL2' in caplog.text
 
 
 @patch.object(suite.ResultsReporter, 'get_jobs')

diff --git a/teuthology/test/test_misc.py b/teuthology/test/test_misc.py
index 8ac7aa643bd24c1fd602d3fcbfc43f637a4917fb..3168595308769b8cd4d2ee0616c946b583c8494e 100644 (file)
--- a/teuthology/test/test_misc.py
+++ b/teuthology/test/test_misc.py
@@ -16,27 +16,27 @@ class FakeRemote(object):
 
 def test_sh_normal(caplog):
     assert misc.sh("/bin/echo ABC") == "ABC\n"
-    assert "truncated" not in caplog.text()
+    assert "truncated" not in caplog.text
 
 
 def test_sh_truncate(caplog):
     assert misc.sh("/bin/echo -n AB ; /bin/echo C", 2) == "ABC\n"
-    assert "truncated" in caplog.text()
-    assert "ABC" not in caplog.text()
+    assert "truncated" in caplog.text
+    assert "ABC" not in caplog.text
 
 
 def test_sh_fail(caplog):
     with pytest.raises(subprocess.CalledProcessError) as excinfo:
         misc.sh("/bin/echo -n AB ; /bin/echo C ; exit 111", 2) == "ABC\n"
     assert excinfo.value.returncode == 111
-    for record in caplog.records():
+    for record in caplog.records:
         if record.levelname == 'ERROR':
             assert ('replay full' in record.message or
                     'ABC\n' == record.message)
 
 def test_sh_progress(caplog):
     misc.sh("echo AB ; sleep 5 ; /bin/echo C", 2) == "ABC\n"
-    records = caplog.records()
+    records = caplog.records
     assert ':sh: ' in records[0].message
     assert 'AB' == records[1].message
     assert 'C' == records[2].message

diff --git a/teuthology/test/test_packaging.py b/teuthology/test/test_packaging.py
index 9bcf2b011670b4ea2a52e97125e673da7963b764..83e92e106358bb62ed879dbbf4b9f3ff4d1b6b25 100644 (file)
--- a/teuthology/test/test_packaging.py
+++ b/teuthology/test/test_packaging.py
@@ -384,7 +384,7 @@ class TestBuilderProject(object):
         expected = 'ref/v10.0.1'
         assert result == expected
         expected_log = 'More than one of ref, tag, branch, or sha1 supplied; using tag'
-        assert expected_log in caplog.text()
+        assert expected_log in caplog.text
         return gp
 
     def test_init_from_config_branch_overrides_sha1(self, caplog):
@@ -399,7 +399,7 @@ class TestBuilderProject(object):
         expected = 'ref/jewel'
         assert result == expected
         expected_log = 'More than one of ref, tag, branch, or sha1 supplied; using branch'
-        assert expected_log in caplog.text()
+        assert expected_log in caplog.text
         return gp
 
     REFERENCE_MATRIX = [

diff --git a/tox.ini b/tox.ini
index 6f1db3dde66b966834e6289cbe12fc7b99a3f531..fd030fde8673f02784f80f7a01e0caa06a7049e1 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,6 @@ sitepackages=True
 deps=
   -r{toxinidir}/requirements.txt
   pytest
-  pytest-capturelog
   mock
   fudge
   pytest-cov==1.6
@@ -24,7 +23,6 @@ sitepackages=True
 deps=
   -r{toxinidir}/requirements.txt
   pytest
-  pytest-capturelog
   mock
   fudge
   pytest-cov==1.6
@@ -47,7 +45,6 @@ deps=
   -r{toxinidir}/requirements.txt
   sphinx
   pytest
-  pytest-capturelog
   mock
 commands=
     sphinx-apidoc -f -o . ../teuthology ../teuthology/test ../teuthology/orchestra/test ../teuthology/task/test
@@ -60,7 +57,6 @@ sitepackages=True
 deps=
   -r{toxinidir}/requirements.txt
   pytest
-  pytest-capturelog
   mock
 
 commands=py.test -v {posargs:teuthology/openstack/test/test_openstack.py}