Skip to content

Commit f1f09f1

Browse files
authored
Merge pull request #74 from lorien/test_server
Improve tests
2 parents d0eb45b + 8ea705a commit f1f09f1

10 files changed

+256
-269
lines changed

.flake8

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[flake8]
2+
# https://flake8.readthedocs.io/en/2.0/warnings.html
3+
# E261 - at least two spaces before inline comment
4+
# E265 - block comment should start with '#'
5+
# W503 - line break occured before a binary operator
6+
# F811 - redefinition of unused name
7+
# F401 - name imported but unused
8+
ignore = E261,E265,W503,F811,F401

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,5 @@ setup.cfg
2727
MANIFEST
2828
/.tox/
2929
/3proxy.conf
30+
/.cache/
31+
/.env/

.travis.yml

+4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ env:
1313
# For python3.5 and python3.6 the base python versions
1414
# should be 3.5 and 3.6 accordingly to avoid InterpreterNotFound error
1515
matrix:
16+
allow_failures:
17+
- env: TOX_ENV=qa
1618
include:
19+
- python: 3.4
20+
env: TOX_ENV=qa
1721
- python: 3.5
1822
env: TOX_ENV=py35
1923
- python: 3.6

pylintrc

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
[MASTER]
2+
jobs=4
3+
extension-pkg-whitelist=
4+
#ignore=invalid_import.py
5+
6+
[TYPECHEK]
7+
ignored-modules=
8+
9+
[MESSAGES CONTROL]
10+
disable=R,I,fixme,missing-docstring
11+
12+
[REPORTS]
13+
reports=no
14+
15+
[BASIC]
16+
method-rgx=([a-z_][a-z0-9_]{2,30}|test_[a-z_][a-z0-9_]{2,50})$
17+
function-rgx=([a-z_][a-z0-9_]{2,30}|test_[a-z_][a-z0-9_]{2,50})$
18+
variable-rgx=[a-z_][a-z0-9_]{1,30}$
19+
argument-rgx=[a-z_][a-z0-9_]{1,30}$
20+
21+
[FORMAT]
22+
max-line-length=79

pytest.ini

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[pytest]
2+
testpaths = test
3+
python_files = test_*.py

requirements_dev.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
six
2-
test_server==0.0.26
2+
test_server==0.0.27
33
psutil
4+
pytest
5+
pylint
6+
flake8

runtest.py

-81
This file was deleted.

test/config.py

-8
This file was deleted.

0 commit comments

Comments
 (0)