Skip broken tests
A few tests that rely on communicating with Trusty crypto services no
longer work. It's not clear when they stopped working, so disable for
now.
Bug: 326872100
Test: trusty-ut-ctrl com.android.trusty.rust.keymint.test on cheetah
Test: trusty-ut-ctrl com.android.trusty.rust.keymint.test on shiba
Change-Id: If84592327de3c603993ea5a3ca234e5828f92246
diff --git a/keybox.rs b/keybox.rs
index afcaa4d..e58ba84 100644
--- a/keybox.rs
+++ b/keybox.rs
@@ -66,7 +66,7 @@
#[cfg(test)]
mod tests {
use super::*;
- use test::expect_eq;
+ use test::{expect, expect_eq, skip};
// AOSP keybox test server just XORs data with a constant and checksum it, it is not intended to
// be secure; just to be used to check the IPC commands.
@@ -84,9 +84,14 @@
#[test]
fn unwrap_fake_keybox_data() {
+ if true {
+ skip!("TODO: reinstate test");
+ }
let original_data = b"test_data_to_wrap".as_slice();
let wrapped_data = create_fake_wrapped_data(original_data);
- let unwrapped_data = keybox_unwrap(&wrapped_data).expect("Couldn't unwrap data");
+ let result = keybox_unwrap(&wrapped_data);
+ expect!(result.is_ok(), "Failed to unwrap data: {:?}", result);
+ let unwrapped_data = result.expect("Couldn't unwrap data");
expect_eq!(original_data, unwrapped_data, "Unwrapped data do not match original one");
}
}
diff --git a/keys.rs b/keys.rs
index 6e16e06..84197cf 100644
--- a/keys.rs
+++ b/keys.rs
@@ -299,7 +299,7 @@
mod tests {
use super::*;
use kmr_ta::device::RetrieveKeyMaterial;
- use test::{expect, expect_eq, expect_ne};
+ use test::{expect, expect_eq, expect_ne, skip};
#[test]
fn kak_call_returns_key() {
@@ -369,6 +369,9 @@
#[test]
fn kek_with_different_context_return_different_keys() {
+ if true {
+ skip!("TODO: reinstate test");
+ }
let context1 =
TrustyKekContext::new(true, Some(KdfVersion::Best), Some(OsRollbackVersion::Current));
// Transforming back and forward to raw format to get specific versions
@@ -404,6 +407,9 @@
#[test]
fn legacy_kek_is_different_than_non_legacy() {
+ if true {
+ skip!("TODO: reinstate test");
+ }
let context1 =
TrustyKekContext::new(true, Some(KdfVersion::Best), Some(OsRollbackVersion::Current))
.unwrap();
@@ -446,6 +452,13 @@
os_rollback_version_to_u32(OsRollbackVersion::Version(version)).unwrap();
expect_eq!(version, u32_version, "Wriong version received");
}
+ }
+
+ #[test]
+ fn current_version_to_u32() {
+ if true {
+ skip!("TODO: reinstate test");
+ }
let curr_version = os_rollback_version_to_u32(OsRollbackVersion::Current).unwrap();
expect_ne!(curr_version, 0, "Current version should not be 0");
}
