From a9870b9e0e7e86969c59ac34ddef81e4421c078e Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <stick@gk2.sk>
Date: Tue, 19 Dec 2017 19:32:07 +0100
Subject: [PATCH] tests: update how tests are being run

---
 tests/.gitignore              |  1 -
 tests/run_tests_device.sh     | 37 -----------------------------------
 tests/run_tests_device_emu.sh |  4 ++--
 3 files changed, 2 insertions(+), 40 deletions(-)
 delete mode 100644 tests/.gitignore
 delete mode 100755 tests/run_tests_device.sh

diff --git a/tests/.gitignore b/tests/.gitignore
deleted file mode 100644
index a0512533..00000000
--- a/tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-device_tests/
diff --git a/tests/run_tests_device.sh b/tests/run_tests_device.sh
deleted file mode 100755
index 506805bf..00000000
--- a/tests/run_tests_device.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-if [ \! -d device_tests ]; then
-    curl -s -L https://github.com/trezor/python-trezor/archive/master.tar.gz | tar -xvz --strip-components=2 python-trezor-master/tests/device_tests
-fi
-
-cd device_tests
-
-pytest \
-    -k-multisig \
-    --ignore test_bip32_speed.py \
-    --ignore test_cosi.py \
-    --ignore test_debuglink.py \
-    --ignore test_msg_applysettings.py \
-    --ignore test_msg_changepin.py \
-    --ignore test_msg_clearsession.py \
-    --ignore test_msg_ethereum_signmessage.py \
-    --ignore test_msg_ethereum_signtx.py \
-    --ignore test_msg_ethereum_verifymessage.py \
-    --ignore test_msg_getaddress_show.py \
-    --ignore test_msg_loaddevice_xprv.py \
-    --ignore test_msg_nem_getaddress.py \
-    --ignore test_msg_nem_signtx.py \
-    --ignore test_msg_ping.py \
-    --ignore test_msg_recoverydevice_dryrun.py \
-    --ignore test_msg_recoverydevice.py \
-    --ignore test_msg_resetdevice_skipbackup.py \
-    --ignore test_msg_signmessage_segwit_native.py \
-    --ignore test_msg_signmessage_segwit.py \
-    --ignore test_msg_signtx_bch.py \
-    --ignore test_msg_signtx_zcash.py \
-    --ignore test_msg_verifymessage_segwit_native.py \
-    --ignore test_msg_verifymessage_segwit.py \
-    --ignore test_multisig_change.py \
-    --ignore test_multisig.py \
-    --ignore test_protect_call.py \
-    --ignore test_protection_levels.py
diff --git a/tests/run_tests_device_emu.sh b/tests/run_tests_device_emu.sh
index 33cd827b..9e235610 100755
--- a/tests/run_tests_device_emu.sh
+++ b/tests/run_tests_device_emu.sh
@@ -9,10 +9,10 @@ sleep 1
 # run tests
 cd ../tests
 error=0
-if ! TREZOR_TRANSPORT_V1=0 ./run_tests_device.sh; then
+if ! TREZOR_TRANSPORT_V1=0 pytest -k 'not skip_t2' --pyargs trezorlib.tests.device_tests ; then
     error=1
 fi
-if ! TREZOR_TRANSPORT_V1=1 ./run_tests_device.sh; then
+if ! TREZOR_TRANSPORT_V1=1 pytest -k 'not skip_t2' --pyargs trezorlib.tests.device_tests ; then
     error=1
 fi
 kill $upy_pid