From 39e64d8a46650bd0d8bb6a6deb18b011f993dd55 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Wed, 27 Mar 2024 23:18:56 -0400
Subject: [PATCH] Attempt to get CI green again

---
 security-framework/src/authorization.rs              | 1 -
 security-framework/src/os/macos/certificate.rs       | 1 -
 security-framework/src/os/macos/digest_transform.rs  | 2 --
 security-framework/src/os/macos/encrypt_transform.rs | 2 --
 security-framework/src/os/macos/identity.rs          | 1 -
 security-framework/src/os/macos/import_export.rs     | 1 -
 security-framework/src/os/macos/passwords.rs         | 2 +-
 security-framework/src/secure_transport.rs           | 1 -
 systest/Cargo.toml                                   | 2 +-
 systest/build.rs                                     | 2 +-
 10 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/security-framework/src/authorization.rs b/security-framework/src/authorization.rs
index 71bc0504..923be0be 100644
--- a/security-framework/src/authorization.rs
+++ b/security-framework/src/authorization.rs
@@ -642,7 +642,6 @@ impl Drop for Authorization {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use core_foundation::string::CFString;
 
     #[test]
     fn test_create_default_authorization() {
diff --git a/security-framework/src/os/macos/certificate.rs b/security-framework/src/os/macos/certificate.rs
index 314a4c33..b50ee52d 100644
--- a/security-framework/src/os/macos/certificate.rs
+++ b/security-framework/src/os/macos/certificate.rs
@@ -215,7 +215,6 @@ pub enum PropertyType {
 #[cfg(test)]
 mod test {
     use super::*;
-    use crate::os::macos::certificate_oids::CertificateOid;
     use crate::test::certificate;
     use std::collections::HashMap;
 
diff --git a/security-framework/src/os/macos/digest_transform.rs b/security-framework/src/os/macos/digest_transform.rs
index b0b724e7..c086ed1a 100644
--- a/security-framework/src/os/macos/digest_transform.rs
+++ b/security-framework/src/os/macos/digest_transform.rs
@@ -163,8 +163,6 @@ impl Builder {
 #[cfg(test)]
 mod test {
     use super::*;
-    use core_foundation::data::CFData;
-    use hex;
 
     #[test]
     fn md5() {
diff --git a/security-framework/src/os/macos/encrypt_transform.rs b/security-framework/src/os/macos/encrypt_transform.rs
index 8bd20ce7..7b9736da 100644
--- a/security-framework/src/os/macos/encrypt_transform.rs
+++ b/security-framework/src/os/macos/encrypt_transform.rs
@@ -203,11 +203,9 @@ impl Builder {
 
 #[cfg(test)]
 mod test {
-    use core_foundation::data::CFData;
     use hex::FromHex;
 
     use super::*;
-    use crate::key::SecKey;
     use crate::os::macos::item::KeyType;
     use crate::os::macos::key::SecKeyExt;
 
diff --git a/security-framework/src/os/macos/identity.rs b/security-framework/src/os/macos/identity.rs
index d54cbe00..0f8da464 100644
--- a/security-framework/src/os/macos/identity.rs
+++ b/security-framework/src/os/macos/identity.rs
@@ -44,7 +44,6 @@ mod test {
     use tempfile::tempdir;
 
     use super::*;
-    use crate::identity::SecIdentity;
     use crate::os::macos::certificate::SecCertificateExt;
     use crate::os::macos::import_export::ImportOptions;
     use crate::os::macos::keychain::CreateOptions;
diff --git a/security-framework/src/os/macos/import_export.rs b/security-framework/src/os/macos/import_export.rs
index ed369511..830d9483 100644
--- a/security-framework/src/os/macos/import_export.rs
+++ b/security-framework/src/os/macos/import_export.rs
@@ -243,7 +243,6 @@ mod test {
     use super::*;
     use crate::import_export::*;
     use crate::os::macos::keychain;
-    use hex;
     use tempfile::tempdir;
 
     #[test]
diff --git a/security-framework/src/os/macos/passwords.rs b/security-framework/src/os/macos/passwords.rs
index 94e1d6fa..8587a3c5 100644
--- a/security-framework/src/os/macos/passwords.rs
+++ b/security-framework/src/os/macos/passwords.rs
@@ -349,7 +349,7 @@ impl SecKeychain {
 #[cfg(test)]
 mod test {
     use super::*;
-    use crate::os::macos::keychain::{CreateOptions, SecKeychain};
+    use crate::os::macos::keychain::CreateOptions;
     use tempfile::tempdir;
     use tempfile::TempDir;
 
diff --git a/security-framework/src/secure_transport.rs b/security-framework/src/secure_transport.rs
index eaf82fe5..0e382dd7 100644
--- a/security-framework/src/secure_transport.rs
+++ b/security-framework/src/secure_transport.rs
@@ -1500,7 +1500,6 @@ impl ServerBuilder {
 
 #[cfg(test)]
 mod test {
-    use std::io;
     use std::io::prelude::*;
     use std::net::TcpStream;
 
diff --git a/systest/Cargo.toml b/systest/Cargo.toml
index 02ceb0a5..d432a699 100644
--- a/systest/Cargo.toml
+++ b/systest/Cargo.toml
@@ -11,7 +11,7 @@ security-framework-sys = { path = "../security-framework-sys" }
 libc = "0.2.139"
 
 [build-dependencies]
-ctest = "0.2.22"
+ctest2 = "0.4.7"
 
 [features]
 OSX_10_9 = ["security-framework-sys/OSX_10_9"]
diff --git a/systest/build.rs b/systest/build.rs
index 8f39a2ba..225fbae5 100644
--- a/systest/build.rs
+++ b/systest/build.rs
@@ -1,7 +1,7 @@
 use std::env;
 
 fn main() {
-    let mut test = ctest::TestGenerator::new();
+    let mut test = ctest2::TestGenerator::new();
 
     #[cfg(feature = "OSX_10_9")]
     test.cfg("feature", Some("OSX_10_9"));