Refactor tests and CI

Author: voronind

.travis.yml

@@ -1,19 +1,41 @@
 dist: bionic
 sudo: false
 cache:
-    pip: true
+    directories:
+        - $HOME/.cache/pip
+        - $HOME/.cache/pipenv
 
 language: python
 python:
+    # First value is default
     - "3.5"
     - "3.6"
     - "pypy3.5"
 
 install:
-    - python3 -m pip install tox tox-travis
+    - pip install pipenv
+    - pipenv install --dev --skip-lock
 
 script:
-    - tox
+    - pipenv run fulltest
+
+jobs:
+    include:
+        - stage: Test
+          name: Test docs
+          install:
+              - pip install pipenv sphinx
+              - pipenv install --skip-lock
+          script:
+              - pipenv run doctest
+              - pipenv run build-docs
+
+        - stage: Coverage
+          name: codecov
+          before_script: pip install codecov
+          script:
+              - pytest --cov
+              - codecov --required
 
 env:
     secure: "ci9SGpJhSCsF3EKNpn0N0LfvCjTDAS/OMn2EIkzyh0d1mwcWX/O56osLsqYqEK+JCUIS+t1E4u99iLSABecTTotqZ8yVwpDaiyLMjwbBYJ2TdmkYvi9bYgyLVmAZ3UZUIwu2pLwTQBWN1a3ng5VQert2xSsxc9E0uNhd7GxkHkbgOMaD17mC7EPIy7e6QfYCskFn8Z+V+FTM9JRkjpnq+KOhDy5f/7H3ePEx3AvoMBW4LSYjIiQFVh+kIIbvvg7EhNdqJIcvdvkQ2M7Eqw2pj2cExB3RyRO6YQf4ie7//enXyRcCHKLTwtx1cBOSOjLqUJhkYBcm4vTBPLs11nz76sGFah+EXCGx9WcCrvUE5Zz5mcP165xpUBFKot8WEAfja+gH+5dH+3v4H86RLPwG4dE/kIz5i8R85dvZRWkKZdcaKfVYuZhij7QFqxbNLmuhyYTdw+J9vyHK7rE2ZthUNeQGgMNGtnQ56fPA5Foy0xseqxRwMvU6m7bTeFEBvXq4afTI+VSlodUYh492v9pV+LHnZ6uNJrJKCMvqLW+LVvrFJUdb0t4qH5aZ94loUtbCnipRR4vYWId5D+NqiVth6EhWypNjJCINtFaOP8NUCMBdbX8RQjZ0W0r++9q07hXvsoEVK3ofjtYnGJfqfanKqS0DmXsgH8LKyPvd75zoc9U="

Pipfile

@@ -17,15 +17,15 @@ pytest-pythonpath = "*"
 "flake8-quotes" = "~=0.8"
 "flake8-commas" = "~=0.1"
 "flake8_tuple" = "~=0.2"
-tox = "~=2.3"
 Sphinx = "~=1.4"
 sphinx-autobuild = "~=0.6"
 
 [requires]
 python_version = "3.5"
 
 [scripts]
-test = "pytest --flake8"
+test = "pytest --exitfirst --failed-first"
+fulltest = "pytest --flake8 --cov --no-cov-on-fail vk tests docs/conf.py"
 # We use equivalent of "make mode":
 # sphinx-build -M builder . _build
 docs = "sphinx-autobuild --open-browser --port 0 --delay 1 -d docs/_build/doctrees docs docs/_build/html"

setup.cfg

@@ -22,11 +22,8 @@ classifiers =
 [options]
 packages = find:
 
-[bdist_wheel]
-universal = 1
-
 [tox:tox]
-envlist = py35, py36, pypy3
+envlist = py35, py36, pypy3, docs
 skipsdist = true
 
 [testenv]
@@ -37,15 +34,26 @@ deps =
     pipenv<2018.7
 commands=
     pipenv install --dev --skip-lock
-    pipenv run test
+    pipenv run fulltest
     py35: pipenv run doctest
     py35: pipenv run build-docs
 
+[testenv:docs]
+basepython = python3.5
+deps =
+    ; 2018.7.1 contains error
+    pipenv<2018.7
+    sphinx
+commands=
+    pipenv install --skip-lock
+    pipenv run doctest
+    pipenv run build-docs
+
 [tool:pytest]
-testpaths = tests docs/conf.py
+testpaths = tests
 norecursedirs =
     .*/
-    doc/
+    docs/
 
 [flake8]
 max-line-length = 120
@@ -54,9 +62,11 @@ exclude =
     docs/_build/
 
 [coverage:run]
+source = vk
 branch = True
-source =
-    vk/
+
+[coverage:report]
+fail_under = 50
 
 [mypy]
 check_untyped_defs = yes

tests/auth/test_auth.py

@@ -1,27 +1,29 @@
-import pytest
+from pytest import fixture, mark
 
+import vk
 
-@pytest.fixture
+
+@fixture
 def user_login():
     return 'user-login'
 
 
-@pytest.fixture
+@fixture
 def user_password():
     return 'user-password'
 
 
-@pytest.fixture
+@fixture
 def app_id():
     return 'app-id'
 
 
-@pytest.fixture
+@fixture
 def scope():
     return 'scope'
 
 
-@pytest.fixture(autouse=True)
+@fixture(autouse=True)
 def mock_requests_session(monkeypatch, user_login, user_password, access_token, response_class, session_class):
 
     class MockedSession(session_class):
@@ -47,3 +49,13 @@ def mocked_request(self, method, url, **kwargs):
             raise NotImplementedError
 
     monkeypatch.setattr('requests.Session', MockedSession)
+
+
+@mark.skip
+def test_login(user_login, user_password, app_id, scope, access_token):
+
+    api = vk.API(user_login=user_login, user_password=user_password, app_id=app_id, scope=scope)
+    assert 'access_token' not in api._session.method_default_params
+
+    api._session.update_access_token()
+    assert api._session.method_default_params.get('access_token') == access_token