From 79fedfd389e03b524747b7153a8163af433c8e83 Mon Sep 17 00:00:00 2001
From: ciny <stanislav.marcinko@satoshilabs.com>
Date: Tue, 1 Oct 2019 12:04:55 +0200
Subject: [PATCH] tests: enable nobackup tests for T1

---
 tests/device_tests/test_msg_backup_device.py  | 12 +--
 .../test_msg_resetdevice_bip39_nobackup.py    | 74 -------------------
 2 files changed, 4 insertions(+), 82 deletions(-)
 delete mode 100644 tests/device_tests/test_msg_resetdevice_bip39_nobackup.py

diff --git a/tests/device_tests/test_msg_backup_device.py b/tests/device_tests/test_msg_backup_device.py
index c0ad6585c6..635056ef5d 100644
--- a/tests/device_tests/test_msg_backup_device.py
+++ b/tests/device_tests/test_msg_backup_device.py
@@ -257,7 +257,6 @@ def test_backup_slip39_advanced(client):
 
 
 # we only test this with bip39 because the code path is always the same
-@pytest.mark.skip_t1
 @pytest.mark.setup_client(uninitialized=True)
 def test_no_backup_fails(client):
     device.reset(
@@ -276,14 +275,13 @@ def test_no_backup_fails(client):
     assert client.features.needs_backup is False
 
     # backup attempt should fail because no_backup=True
-    with pytest.raises(TrezorFailure, match="ProcessError: Seed already backed up"):
+    with pytest.raises(TrezorFailure, match=r".*Seed already backed up"):
         device.backup(client)
 
 
 # we only test this with bip39 because the code path is always the same
-@pytest.mark.skip_t1
 @pytest.mark.setup_client(uninitialized=True)
-def test_interupt_backup_fails(client):
+def test_interrupt_backup_fails(client):
     device.reset(
         client,
         display_random=False,
@@ -313,17 +311,15 @@ def test_interupt_backup_fails(client):
     assert client.features.no_backup is False
 
     # Second attempt at backup should fail
-    with pytest.raises(TrezorFailure, match="ProcessError: Seed already backed up"):
+    with pytest.raises(TrezorFailure, match=r".*Seed already backed up"):
         device.backup(client)
 
 
 # we only test this with bip39 because the code path is always the same
-@pytest.mark.skip_t1
 @pytest.mark.setup_client(uninitialized=True)
 def test_no_backup_show_entropy_fails(client):
     with pytest.raises(
-        TrezorFailure,
-        match="ProcessError: Can't show internal entropy when backup is skipped",
+        TrezorFailure, match=r".*Can't show internal entropy when backup is skipped"
     ):
         device.reset(
             client,
diff --git a/tests/device_tests/test_msg_resetdevice_bip39_nobackup.py b/tests/device_tests/test_msg_resetdevice_bip39_nobackup.py
deleted file mode 100644
index d4e9c2ea41..0000000000
--- a/tests/device_tests/test_msg_resetdevice_bip39_nobackup.py
+++ /dev/null
@@ -1,74 +0,0 @@
-# This file is part of the Trezor project.
-#
-# Copyright (C) 2012-2019 SatoshiLabs and contributors
-#
-# This library is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# as published by the Free Software Foundation.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the License along with this library.
-# If not, see <https://www.gnu.org/licenses/lgpl-3.0.html>.
-
-import pytest
-
-from trezorlib import messages as proto
-
-
-class TestMsgResetDeviceNobackup:
-
-    external_entropy = b"zlutoucky kun upel divoke ody" * 2
-    strength = 128
-
-    @pytest.mark.setup_client(uninitialized=True)
-    def test_reset_device_no_backup(self, client):
-        ret = client.call_raw(
-            proto.ResetDevice(
-                display_random=False,
-                strength=self.strength,
-                passphrase_protection=False,
-                pin_protection=False,
-                language="english",
-                label="test",
-                no_backup=True,
-            )
-        )
-
-        assert isinstance(ret, proto.ButtonRequest)
-        client.debug.press_yes()
-        ret = client.call_raw(proto.ButtonAck())
-
-        # Provide entropy
-        assert isinstance(ret, proto.EntropyRequest)
-        ret = client.call_raw(proto.EntropyAck(entropy=self.external_entropy))
-        assert isinstance(ret, proto.Success)
-
-        # Check if device is properly initialized
-        ret = client.call_raw(proto.Initialize())
-        assert ret.initialized is True
-        assert ret.needs_backup is False
-        assert ret.unfinished_backup is False
-        assert ret.no_backup is True
-
-        # start backup - should fail
-        ret = client.call_raw(proto.BackupDevice())
-        assert isinstance(ret, proto.Failure)
-
-    @pytest.mark.setup_client(uninitialized=True)
-    def test_reset_device_no_backup_show_entropy_fail(self, client):
-        ret = client.call_raw(
-            proto.ResetDevice(
-                display_random=True,
-                strength=self.strength,
-                passphrase_protection=False,
-                pin_protection=False,
-                language="english",
-                label="test",
-                no_backup=True,
-            )
-        )
-        assert isinstance(ret, proto.Failure)