Fix tests for Gnuk emulation (skip test with no KDF setup).

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>

tests/openpgp_card.py

@@ -60,6 +60,7 @@ class OpenPGP_Card(object):
         self.__kdf_salt_reset = None
         self.__kdf_salt_admin = None
         self.is_gnuk = (reader.get_string(2) == "Gnuk Token")
+        self.is_emulated_gnuk = (reader.get_string(3)[-8:] == "EMULATED")
 
     def configure_with_kdf(self):
         kdf_data = self.cmd_get_data(0x00, 0xf9)

tests/skip_if_emulation.py

@@ -0,0 +1,6 @@
+import pytest
+
+@pytest.fixture(scope="module",autouse=True)
+def check_emulation(card):
+    if card.is_emulated_gnuk:
+        pytest.skip("Emulation requires KDF setup", allow_module_level=True)

tests/skip_if_gnuk.py

@@ -0,0 +1,6 @@
+import pytest
+
+@pytest.fixture(scope="module",autouse=True)
+def check_gnuk(card):
+    if card.is_gnuk:
+        pytest.skip("Gnuk has no support for those features", allow_module_level=True)

tests/test_001_personalize_card.py

@@ -1 +1,2 @@
+from skip_if_emulation import *
 from card_test_personalize_card import *

tests/test_002_personalize_reset.py

@@ -1 +1,2 @@
+from skip_if_emulation import *
 from card_test_personalize_reset import *

tests/test_003_remove_keys.py

@@ -1 +1,2 @@
+from skip_if_emulation import *
 from card_test_remove_keys import *

tests/test_004_reset_pw3.py

@@ -1 +1,2 @@
+from skip_if_emulation import *
 from card_test_reset_pw3 import *

tests/test_005_personalize_admin_less.py

@@ -20,6 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
+from skip_if_emulation import *
 from skip_gnuk_only_tests import *
 
 from card_test_personalize_admin_less import *

tests/test_006_pso.py

@@ -1,8 +1,9 @@
+from skip_if_gnuk import *
+from card_test_ed25519 import *
+from card_test_x25519 import *
 from card_test_ansix9p256r1 import *
 from card_test_ansix9p384r1 import *
 from card_test_ansix9p512r1 import *
 from card_test_brainpoolp256r1 import *
 from card_test_brainpoolp384r1 import *
 from card_test_brainpoolp512r1 import *
-from card_test_ed25519 import *
-from card_test_x25519 import *

tests/test_009_keygen.py

@@ -20,5 +20,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
+from skip_if_emulation import *
 from card_test_keygen import *
 from card_test_remove_keys import *

tests/test_021_personalize_admin_less.py

@@ -1 +1,5 @@
-from test_005_personalize_admin_less import *
+from skip_gnuk_only_tests import *
+from card_test_personalize_admin_less import *
+from card_test_personalize_reset import *
+from card_test_remove_keys import *
+from card_test_reset_pw3 import *