Fix #4664: Reading objects.inv fails again

This commit is contained in:
Takeshi KOMIYA
2018-02-23 00:49:08 +09:00
parent 4b0ff9a0d3
commit cd08a6503c
3 changed files with 25 additions and 11 deletions

View File

@@ -22,7 +22,7 @@ from test_util_inventory import inventory_v2, inventory_v2_not_having_version
from sphinx import addnodes
from sphinx.ext.intersphinx import (
load_mappings, missing_reference, _strip_basic_auth,
_get_safe_url, fetch_inventory, INVENTORY_FILENAME, debug
_get_safe_url, fetch_inventory, INVENTORY_FILENAME, inspect_main
)
from sphinx.ext.intersphinx import setup as intersphinx_setup
@@ -393,10 +393,10 @@ def test_getsafeurl_unauthed():
assert expected == actual
def test_debug_noargs(capsys):
"""debug interface, without arguments"""
def test_inspect_main_noargs(capsys):
"""inspect_main interface, without arguments"""
with pytest.raises(SystemExit):
debug(['sphinx/ext/intersphinx.py'])
inspect_main([])
expected = (
"Print out an inventory file.\n"
@@ -407,12 +407,12 @@ def test_debug_noargs(capsys):
assert stderr == expected + "\n"
def test_debug_file(capsys, tempdir):
"""debug interface, with file argument"""
def test_inspect_main_file(capsys, tempdir):
"""inspect_main interface, with file argument"""
inv_file = tempdir / 'inventory'
inv_file.write_bytes(inventory_v2)
debug(['sphinx/ext/intersphinx.py', str(inv_file)])
inspect_main([str(inv_file)])
stdout, stderr = capsys.readouterr()
assert stdout.startswith("c:function\n")
@@ -420,8 +420,8 @@ def test_debug_file(capsys, tempdir):
@mock.patch('requests.get')
def test_debug_url(fake_get, capsys):
"""debug interface, with url argument"""
def test_inspect_main_url(fake_get, capsys):
"""inspect_main interface, with url argument"""
raw = BytesIO(inventory_v2)
real_read = raw.read
@@ -436,7 +436,7 @@ def test_debug_url(fake_get, capsys):
resp.raw = raw
fake_get.return_value = resp
debug(['sphinx/ext/intersphinx.py', url])
inspect_main([url])
stdout, stderr = capsys.readouterr()
assert stdout.startswith("c:function\n")