Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Attempt to get CI green again #198

Merged
merged 1 commit into from
Mar 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion security-framework/src/authorization.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
1 change: 0 additions & 1 deletion security-framework/src/os/macos/certificate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 0 additions & 2 deletions security-framework/src/os/macos/digest_transform.rs
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,6 @@ impl Builder {
#[cfg(test)]
mod test {
use super::*;
use core_foundation::data::CFData;
use hex;

#[test]
fn md5() {
Expand Down
2 changes: 0 additions & 2 deletions security-framework/src/os/macos/encrypt_transform.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 0 additions & 1 deletion security-framework/src/os/macos/identity.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion security-framework/src/os/macos/import_export.rs
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,6 @@ mod test {
use super::*;
use crate::import_export::*;
use crate::os::macos::keychain;
use hex;
use tempfile::tempdir;

#[test]
Expand Down
2 changes: 1 addition & 1 deletion security-framework/src/os/macos/passwords.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 0 additions & 1 deletion security-framework/src/secure_transport.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1500,7 +1500,6 @@ impl ServerBuilder {

#[cfg(test)]
mod test {
use std::io;
use std::io::prelude::*;
use std::net::TcpStream;

Expand Down
2 changes: 1 addition & 1 deletion systest/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion systest/build.rs
Original file line number Diff line number Diff line change
@@ -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"));
Expand Down
Loading