make tests work with Security Key

Yubico · Aug 30, 2024 · a8487bb · a8487bb
1 parent 65ce3a0
commit a8487bb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/testing-android/src/main/java/com/yubico/yubikit/testing/framework/YKInstrumentedTests.java b/testing-android/src/main/java/com/yubico/yubikit/testing/framework/YKInstrumentedTests.java
@@ -63,7 +63,7 @@ public void getYubiKey() throws InterruptedException {
             if (deviceInfo.getVersion().major == 0) {
                 SessionVersionOverride.set(new Version(5, 7, 2));
             }
-        } catch (IOException ignored) {
+        } catch (IOException | IllegalStateException ignored) {
         }
     }
 

diff --git a/testing/src/main/java/com/yubico/yubikit/testing/oath/OathTestState.java b/testing/src/main/java/com/yubico/yubikit/testing/oath/OathTestState.java
@@ -72,6 +72,8 @@ protected OathTestState(OathTestState.Builder builder) throws Throwable {
         }
 
         try (SmartCardConnection connection = openSmartCardConnection()) {
+            assumeTrue("Smart card not available", connection != null);
+
             OathSession oath = getOathSession(connection, scpParameters);
 
             assumeTrue("OATH not available", oath != null);

diff --git a/testing/src/main/java/com/yubico/yubikit/testing/openpgp/OpenPgpTestState.java b/testing/src/main/java/com/yubico/yubikit/testing/openpgp/OpenPgpTestState.java
@@ -87,6 +87,8 @@ protected OpenPgpTestState(OpenPgpTestState.Builder builder) throws Throwable {
         }
 
         try (SmartCardConnection connection = openSmartCardConnection()) {
+            assumeTrue("Smart card not available", connection != null);
+
             OpenPgpSession openPgp = getOpenPgpSession(connection, scpParameters);
 
             assumeTrue("OpenPGP not available", openPgp != null);