Skip to content

Commit

Permalink
Unify configs (#4394)
Browse files Browse the repository at this point in the history
  • Loading branch information
asvetlov authored Nov 27, 2019
1 parent bbe5279 commit 3aef308
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 23 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -60,21 +60,21 @@ check_changes:
@touch .develop

test: .develop
@pytest -c pytest.ci.ini -q
@pytest -q

vtest: .develop
@pytest -c pytest.ci.ini -s -v
@pytest -s -v

cov cover coverage:
tox

cov-dev: .develop
@pytest -c pytest.ci.ini --cov-report=html
@pytest --cov-report=html
@echo "open file://`pwd`/htmlcov/index.html"

cov-ci-run: .develop
@echo "Regular run"
@pytest -c pytest.ci.ini --cov-report=html
@pytest --cov-report=html

cov-dev-full: cov-ci-run
@echo "open file://`pwd`/htmlcov/index.html"
Expand Down
9 changes: 0 additions & 9 deletions pytest.ci.ini

This file was deleted.

9 changes: 0 additions & 9 deletions pytest.ini

This file was deleted.

11 changes: 11 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,17 @@ branch = True
source = aiohttp, tests
omit = site-packages

[tool:pytest]
addopts = --cov=aiohttp -v -rxXs --durations 10
filterwarnings =
error
ignore:module 'ssl' has no attribute 'OP_NO_COMPRESSION'. The Python interpreter is compiled against OpenSSL < 1.0.0. Ref. https.//docs.python.org/3/library/ssl.html#ssl.OP_NO_COMPRESSION:UserWarning
junit_suite_name = aiohttp_test_suite
norecursedirs = dist docs build .tox .eggs
minversion = 3.8.2
testpaths = tests/
junit_family=xunit2

[mypy]
follow_imports = silent
strict_optional = True
Expand Down
2 changes: 1 addition & 1 deletion tests/test_web_request.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def test_ctor() -> None:
assert 'GET' == req.method
assert HttpVersion(1, 1) == req.version
# MacOS may return CamelCased host name, need .lower()
assert req.host == socket.getfqdn().lower()
assert req.host.lower() == socket.getfqdn().lower()
assert '/path/to?a=1&b=2' == req.path_qs
assert '/path/to' == req.path
assert 'a=1&b=2' == req.query_string
Expand Down

0 comments on commit 3aef308

Please sign in to comment.