forked from extern/httpie-cli
Fix tests
This commit is contained in:
parent
1bc54d4cb4
commit
38bc578744
8
Makefile
8
Makefile
@ -93,7 +93,7 @@ test-dist: test-sdist test-bdist-wheel
|
||||
|
||||
test-tox: uninstall-httpie install
|
||||
@echo $(H1)Running tests on all Pythons via Tox$(H1END)
|
||||
tox
|
||||
$(VENV_BIN)/tox
|
||||
@echo
|
||||
|
||||
|
||||
@ -139,8 +139,8 @@ publish-no-test:
|
||||
@echo $(H1)Testing wheel build an installation$(H1END)
|
||||
@echo "$(VERSION)"
|
||||
@echo "$(VERSION)" | grep -q "dev" && echo '!!!Not publishing dev version!!!' && exit 1 || echo ok
|
||||
python setup.py sdist bdist_wheel
|
||||
twine upload dist/*
|
||||
$(VENV_PYTHON) setup.py sdist bdist_wheel
|
||||
$(VENV_BIN)/twine upload dist/*
|
||||
@echo
|
||||
|
||||
|
||||
@ -154,7 +154,7 @@ uninstall-httpie:
|
||||
- $(VENV_PIP) uninstall --yes httpie &2>/dev/null
|
||||
|
||||
@echo "Verifying…"
|
||||
cd .. && ! python -m httpie --version &2>/dev/null
|
||||
cd .. && ! $(VENV_PYTHON) -m httpie --version &2>/dev/null
|
||||
|
||||
@echo "Done"
|
||||
@echo
|
||||
|
@ -1,6 +1,7 @@
|
||||
import os
|
||||
import subprocess
|
||||
from glob import glob
|
||||
from pathlib import Path
|
||||
|
||||
import pytest
|
||||
|
||||
@ -38,12 +39,24 @@ filenames = list(sorted(rst_filenames()))
|
||||
assert filenames
|
||||
|
||||
|
||||
@pytest.mark.skipif(not has_docutils(), reason='docutils not installed')
|
||||
# HACK: hardcoded paths, venv should be irrelevant, etc.
|
||||
# TODO: replaces the process with Python code
|
||||
VENV_BIN = Path(__file__).parent.parent / 'venv/bin'
|
||||
VENV_PYTHON = VENV_BIN / 'python'
|
||||
VENV_RST2PSEUDOXML = VENV_BIN / 'rst2pseudoxml.py'
|
||||
|
||||
|
||||
@pytest.mark.skipif(not os.path.exists(VENV_RST2PSEUDOXML), reason='docutils not installed')
|
||||
@pytest.mark.parametrize('filename', filenames)
|
||||
def test_rst_file_syntax(filename):
|
||||
print(filename)
|
||||
p = subprocess.Popen(
|
||||
['rst2pseudoxml.py', '--report=1', '--exit-status=1', filename],
|
||||
[
|
||||
VENV_PYTHON,
|
||||
VENV_RST2PSEUDOXML,
|
||||
'--report=1',
|
||||
'--exit-status=1',
|
||||
filename,
|
||||
],
|
||||
stderr=subprocess.PIPE,
|
||||
stdout=subprocess.PIPE,
|
||||
shell=True,
|
||||
|
Loading…
Reference in New Issue
Block a user