Replace is_err with unwrap_err

The test should fail if it is a success. Other small fixes.

Signed-off-by: Hugues de Valon <hugues.devalon@arm.com>

Author: hug-dev

tests/per_provider/normal_tests/create_destroy_key.rs

@@ -143,10 +143,11 @@ fn failed_created_key_should_be_removed() -> Result<()> {
     };
 
     // Unsupported parameter, should fail
-    if client.generate_key(key_name.clone(), attributes).is_err() {
-        // The key should not exist anymore in the KIM
-        client.generate_rsa_sign_key(key_name)?;
-    }
+    let _ = client
+        .generate_key(key_name.clone(), attributes)
+        .unwrap_err();
+    // The key should not exist anymore in the KIM
+    client.generate_rsa_sign_key(key_name)?;
 
     Ok(())
 }

tests/per_provider/normal_tests/export_public_key.rs

@@ -85,21 +85,6 @@ fn check_public_rsa_export_format() -> Result<()> {
     Ok(())
 }
 
-#[test]
-fn check_public_rsa_export_format2() -> Result<()> {
-    // Same test but with a RsaPublicKey
-    let mut client = TestClient::new();
-    let key_name = String::from("check_public_rsa_export_format2");
-
-    client.generate_rsa_sign_key(key_name.clone())?;
-
-    let public_key = client.export_public_key(key_name)?;
-
-    // That should not fail if the bytes are in the expected format.
-    let _public_key: RsaPublicKey = picky_asn1_der::from_bytes(&public_key).unwrap();
-    Ok(())
-}
-
 #[test]
 fn check_export_public_possible() -> Result<()> {
     // Exporting a public key is always permitted

tests/per_provider/normal_tests/import_key.rs

@@ -198,8 +198,6 @@ fn check_format_import3() -> Result<()> {
 
 #[test]
 fn failed_imported_key_should_be_removed() -> Result<()> {
-    // If the key_bits field of the key attributes is zero, the operation should still work.
-    // The size of the key is always taken from the data parameter.
     let mut client = TestClient::new();
     let key_name = String::from("failed_imported_key_should_be_removed");
 
@@ -231,13 +229,11 @@ fn failed_imported_key_should_be_removed() -> Result<()> {
         },
     };
 
-    if client
+    let _ = client
         .import_key(key_name.clone(), attributes, Vec::new())
-        .is_err()
-    {
-        // Should succeed because key would have been destroyed.
-        client.import_rsa_public_key(key_name, picky_asn1_der::to_vec(&public_key).unwrap())?;
-    }
+        .unwrap_err();
+    // Should succeed because key would have been destroyed.
+    client.import_rsa_public_key(key_name, picky_asn1_der::to_vec(&public_key).unwrap())?;
 
     Ok(())
 }