From 0765842e7fd110a8b306e540627b83b5d22871cc Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 25 May 2019 13:06:28 +0200 Subject: [PATCH] root: move pytest markers to setup.cfg --- core/pytest.ini | 18 ------------------ setup.cfg | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/core/pytest.ini b/core/pytest.ini index f7b4a230f3..6a724d85e9 100644 --- a/core/pytest.ini +++ b/core/pytest.ini @@ -1,20 +1,2 @@ [pytest] addopts = --pyargs trezorlib.tests.device_tests - -markers = - capricoin - cardano - decred - eos - ethereum - komodo - lisk - monero - nem - ontology - ripple - skip_t1 - skip_t2 - stellar - tezos - zcash diff --git a/setup.cfg b/setup.cfg index ee8f96465b..fcad4e1a5e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -27,3 +27,22 @@ not_skip=__init__.py forced_separate = apps known_standard_library = micropython,ubinascii,ustruct,uctypes,utime,utimeq,trezorio,trezorui,trezorutils,trezorconfig known_third_party = curve25519,ecdsa,hypothesis + +[tool:pytest] +markers = + capricoin + cardano + decred + eos + ethereum + komodo + lisk + monero + nem + ontology + ripple + skip_t1: skip the test on Trezor One. + skip_t2: skip the test on Trezor Model T. + stellar + tezos + zcash