Skip to content

Commit

Permalink
Use pytest instead of nose
Browse files Browse the repository at this point in the history
  • Loading branch information
Jesus89 committed Aug 22, 2016
1 parent 4171d53 commit b4390d7
Show file tree
Hide file tree
Showing 14 changed files with 51 additions and 58 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
*.egg-info
.coverage
.tox/
.cache/
build/
dist/
cover/
htmlcov/
__pycache__/
7 changes: 3 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
language: python
python:
- "2.7"
- "3.5"
install:
- pip install .
- pip install -U tox
- apio install --all
script: nosetests
script:
- tox
6 changes: 2 additions & 4 deletions test/code_commands/test_build.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import apio
from click.testing import CliRunner


def test_apio_build_board():
runner = CliRunner()
result = runner.invoke(apio.build, ['--board', 'icezum'])
def test_apio_build_board(clirunner):
result = clirunner.invoke(apio.build, ['--board', 'icezum'])
assert result.exit_code == 1
6 changes: 2 additions & 4 deletions test/code_commands/test_clean.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import apio
from click.testing import CliRunner


def test_apio_clean():
runner = CliRunner()
result = runner.invoke(apio.clean)
def test_apio_clean(clirunner):
result = clirunner.invoke(apio.clean)
assert result.exit_code == 0
6 changes: 2 additions & 4 deletions test/code_commands/test_sim.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import apio
from click.testing import CliRunner


def test_apio_sim():
runner = CliRunner()
result = runner.invoke(apio.sim)
def test_apio_sim(clirunner):
result = clirunner.invoke(apio.sim)
assert result.exit_code == 1
6 changes: 2 additions & 4 deletions test/code_commands/test_time.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import apio
from click.testing import CliRunner


def test_apio_time_board():
runner = CliRunner()
result = runner.invoke(apio.time, ['--board', 'icezum'])
def test_apio_time_board(clirunner):
result = clirunner.invoke(apio.time, ['--board', 'icezum'])
assert result.exit_code == 1
6 changes: 2 additions & 4 deletions test/code_commands/test_upload.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import apio
from click.testing import CliRunner


def test_apio_upload_board():
runner = CliRunner()
result = runner.invoke(apio.upload, ['--board', 'icezum'])
def test_apio_upload_board(clirunner):
result = clirunner.invoke(apio.upload, ['--board', 'icezum'])
assert result.exit_code == 1
6 changes: 2 additions & 4 deletions test/code_commands/test_verify.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import apio
from click.testing import CliRunner


def test_apio_verify():
runner = CliRunner()
result = runner.invoke(apio.verify)
def test_apio_verify(clirunner):
result = clirunner.invoke(apio.verify)
assert result.exit_code == 1
16 changes: 16 additions & 0 deletions test/conftest.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import pytest
from click.testing import CliRunner


@pytest.fixture(scope="module")
def clirunner():
return CliRunner()


@pytest.fixture(scope="session")
def validate_cliresult():
def decorator(result):
assert result.exit_code == 0
assert not result.exception
assert "error" not in result.output.lower()
return decorator
6 changes: 2 additions & 4 deletions test/env_commands/test_boards.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import apio
from click.testing import CliRunner


def test_apio_boards_list():
runner = CliRunner()
result = runner.invoke(apio.boards, ['--list'])
def test_apio_boards_list(clirunner):
result = clirunner.invoke(apio.boards, ['--list'])
assert result.exit_code == 0
6 changes: 2 additions & 4 deletions test/env_commands/test_install.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import apio
from click.testing import CliRunner


def test_apio_install_list():
runner = CliRunner()
result = runner.invoke(apio.install, ['--list'])
def test_apio_install_list(clirunner):
result = clirunner.invoke(apio.install, ['--list'])
assert result.exit_code == 0
16 changes: 6 additions & 10 deletions test/env_commands/test_system.py
Original file line number Diff line number Diff line change
@@ -1,20 +1,16 @@
import apio
from click.testing import CliRunner


def test_apio_system_lsusb():
runner = CliRunner()
result = runner.invoke(apio.system, ['lsusb'])
def test_apio_system_lsusb(clirunner):
result = clirunner.invoke(apio.system, ['lsusb'])
assert result.exit_code == 0


def test_apio_system_lsftdi():
runner = CliRunner()
result = runner.invoke(apio.system, ['lsftdi'])
def test_apio_system_lsftdi(clirunner):
result = clirunner.invoke(apio.system, ['lsftdi'])
assert result.exit_code == 0


def test_apio_system_platform():
runner = CliRunner()
result = runner.invoke(apio.system, ['platform'])
def test_apio_system_platform(clirunner):
result = clirunner.invoke(apio.system, ['platform'])
assert result.exit_code == 0
6 changes: 2 additions & 4 deletions test/env_commands/test_uninstall.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import apio
from click.testing import CliRunner


def test_apio_uninstall_list():
runner = CliRunner()
result = runner.invoke(apio.uninstall, ['--list'])
def test_apio_uninstall_list(clirunner):
result = clirunner.invoke(apio.uninstall, ['--list'])
assert result.exit_code == 0
13 changes: 6 additions & 7 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,18 @@
envlist = py27, py35

[testenv]
deps = nose
commands = nosetests
deps = pytest
commands = py.test -v test

[testenv:coverage]
basepython = python3.5
deps = nose
coverage
commands = coverage erase
nosetests --with-coverage --cover-package=apio --cover-html
deps = pytest
pytest-cov
commands = py.test --cov=apio --cov-report html -v test

[testenv:flake8]
basepython = python3.5
deps = flake8
commands = flake8 ./apio
commands = flake8 ./apio ./test

# TODO: add pylint

0 comments on commit b4390d7

Please sign in to comment.