0ct0pu5/meli-terminal-mail-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove sealed_test dependency

Browse source 
We're not using its features it provides over using just rusty-fork,
which sealed-test uses its own fork of it (rusty-forkfork) under the
hood.

Revert to just using the original rusty-fork crate, which is also
packaged in debian.

Signed-off-by: Manos Pitsidianakis <manos@pitsidianak.is>
This commit is contained in:
Manos Pitsidianakis 2024-12-04 17:38:49 +02:00
parent 3433c5c3d5
commit ed85da51df
No known key found for this signature in database
GPG key ID: 7729C7707F7E09D0
8 changed files with 30 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
Cargo.lock generated
View file

@ -705,12 +705,6 @@ dependencies = [
"percent-encoding",
]
[[package]]
name = "fs_extra"
version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
[[package]]
name = "fsevent-sys"
version = "4.1.0"
@ -1199,7 +1193,7 @@ dependencies = [
"proc-macro2",
"quote",
"regex",
"sealed_test",
"rusty-fork",
"serde",
"serde_derive",
"serde_json",
@ -1241,7 +1235,7 @@ dependencies = [
"polling 3.7.3",
"regex",
"rusqlite",
"sealed_test",
"rusty-fork",
"serde",
"serde_derive",
"serde_json",
@ -1775,10 +1769,10 @@ dependencies = [
]
[[package]]
name = "rusty-forkfork"
version = "0.4.0"
name = "rusty-fork"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ce85af4dfa2fb0c0143121ab5e424c71ea693867357c9159b8777b59984c218"
checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f"
dependencies = [
"fnv",
"quick-error",
@ -1810,28 +1804,6 @@ dependencies = [
"windows-sys 0.52.0",
]
[[package]]
name = "sealed_test"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2a1867f8f005bd7fb73c367e2e45dd628417906a2ca27597fe59cbf04279a222"
dependencies = [
"fs_extra",
"rusty-forkfork",
"sealed_test_derive",
"tempfile",
]
[[package]]
name = "sealed_test_derive"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77253fb2d4451418d07025826028bcb96ee42d3e58859689a70ce62908009db6"
dependencies = [
"quote",
"syn 2.0.76",
]
[[package]]
name = "security-framework"
version = "2.11.1"

2
meli/Cargo.toml
View file

@ -84,7 +84,7 @@ assert_cmd = { version = "=2.0.13" }
flate2 = { version = "1" }
predicates = { version = "3" }
regex = { version = "1" }
sealed_test = { version = "1.1.0" }
rusty-fork = { version = "0.3.0" }
tempfile = { version = "3.3" }
[target.'cfg(target_os="linux")'.dependencies]

6
meli/src/mail/compose/gpg.rs
View file

@ -397,7 +397,7 @@ mod tests {
use std::{borrow::Cow, ffi::CString, thread::sleep, time::Duration};
use melib::gpgme::{EngineInfo, LocateKey, Protocol};
use sealed_test::prelude::*;
use rusty_fork::rusty_fork_test;
use super::*;
@ -439,7 +439,8 @@ mod tests {
const PUBKEY: &[u8]=b"-----BEGIN PGP PUBLIC KEY BLOCK-----\r\nVersion: GnuPG v2.1.0-gitb3c71eb (GNU/Linux)\r\n\r\nmQGiBDo41NoRBADSfQazKGYf8nokq6zUKH/6INtV6MypSzSGmX2XErnARkIIPPYj\r\ncQRQ8zCbGV7ZU2ezVbzhFLUSJveE8PZUzzCrLp1O2NSyBTRcR5HVSXW95nJfY8eV\r\npOvZRAKul0BVLh81kYTsrfzaaCjh9VWNP26LoeN2r+PjZyktXe7gM3C4SwCgoTxK\r\nWUVi9HoT2HCLY7p7oig5hEcEALdCJal0UYomX3nJapIVLVZg3vkidr1RICYMb2vz\r\n58i17h8sxEtobD1vdIKNejulntaRAXs4n0tDYD9z7pRlwG1CLz1R9WxYzeOOqUDr\r\nfnVXdmU8L/oVWABat8v1V7QQhjMMf+41fuzVwDMMGqjVPLhu4X6wp3A8uyM3YDnQ\r\nVMN1A/4n2G5gHoOvjqxn8Ch5tBAdMGfO8gH4RjQOwzm2R1wPQss/yzUN1+tlMZGX\r\nK2dQ2FCWC/hDUSNaEQRlI15wxxBNZ2RQwlzE2A8v113DpvyzOtv0QO95gJ1teCXC\r\n7j/BN9asgHaBBc39JLO/TcpuI7Hf8PQ5VcP2F0UE3lczGhXbLLRESm9lIFJhbmRv\r\nbSBIYWNrZXIgKHRlc3Qga2V5IHdpdGggcGFzc3BocmFzZSAiYWJjIikgPGpvZUBl\r\neGFtcGxlLmNvbT6IYgQTEQIAIgUCTbdXqQIbIwYLCQgHAwIGFQgCCQoLBBYCAwEC\r\nHgECF4AACgkQr4IkT5zZ/VUcCACfQvSPi//9/gBv8SVrK6O4DiyD+jAAn3LEnfF1\r\n4j6MjwlqXTqol2VgQn1yuQENBDo41N0QBACedJb7Qhm50JSPe1V+rSZKLHT5nc3l\r\n2k1n7//wNsJkgDW2J7snIRjGtSzeNxMPh+hVzFidzAf3sbOlARQoBrMPPKpnJWtm\r\n6LEDf2lSwO36l0/bo6qDRmiFRJoHWytTJEjxVwRclVt4bXqHfNw9FKhZZbcKeAN2\r\noHgmBVSU6edHdwADBQP+OGAkEG4PcfSb8x191R+wkV/q2hA5Ay9z289Dx2rO28CO\r\n4M2fhhcjSmgr6x0DsrkfESCiG47UGJ169eu+QqJwk3HiF4crGN9rE5+VelBVFtrd\r\nMWkX2rPLGQWyw8iCZKbeH8g/ujmkaLovSmalzDcLe4v1xSLaP7Fnfzit0iIGZAGI\r\nRgQYEQIABgUCOjjU3QAKCRCvgiRPnNn9VVSaAJ9+rj1lIQnRl20i8Rom2Hwbe3re\r\n9QCfSYFnkZUw0yKF2DfCfqrDzdGAsbaIRgQYEQIABgUCOjjU3gAKCRCvgiRPnNn9\r\nVe4iAJ9FrGMlFR7s+GWf1scTeeyrthKrPQCfSpc/Yps72aFI7hPfyIa9MuerVZ4=\r\n=QRit\r\n-----END PGP PUBLIC KEY BLOCK-----\r\n";
#[sealed_test]
rusty_fork_test! {
#[test]
fn test_gpg_verify_sig() {
let tempdir = tempfile::tempdir().unwrap();
{
@ -568,4 +569,5 @@ mod tests {
}
}
}
}
}

6
meli/src/sqlite3/tests.rs
View file

@ -28,7 +28,7 @@ use std::{
};
use melib::{backends::prelude::*, maildir::MaildirType};
use sealed_test::prelude::*;
use rusty_fork::rusty_fork_test;
use tempfile::TempDir;
use super::*;
@ -97,7 +97,8 @@ fn new_maildir_backend(
MaildirType::new(&account_conf, Default::default(), event_consumer)
}
#[sealed_test]
rusty_fork_test! {
#[test]
fn test_sqlite3_reindex() {
use futures::stream::TryStreamExt;
@ -426,3 +427,4 @@ fn test_sqlite3_reindex() {
);
eprintln_ok();
}
}

6
meli/tests/test_cli_subcommands.rs
View file

@ -24,10 +24,11 @@ use std::{io::Write, path::Path};
use assert_cmd::{assert::OutputAssertExt, Command};
use predicates::prelude::*;
use sealed_test::prelude::*;
use rusty_fork::rusty_fork_test;
use tempfile::TempDir;
#[sealed_test]
rusty_fork_test! {
#[test]
fn test_cli_subcommands() {
for var in [
"PAGER",
@ -280,3 +281,4 @@ server_password_command = "false"
tmp_dir.close().unwrap();
}
}

2
melib/Cargo.toml
View file

@ -80,6 +80,6 @@ tls-static = ["tls", "native-tls/vendored"]
flate2 = { version = "1.0.16" }
[dev-dependencies]
sealed_test = { version = "1.1.0" }
rusty-fork = { version = "0.3.0" }
tempfile = { version = "3.3" }
toml = { version = "0.8", default-features = false, features = ["display","preserve_order","parse"] }

6
melib/src/gpgme/tests.rs
View file

@ -22,7 +22,7 @@
use std::{borrow::Cow, ffi::CString, future::Future};
use sealed_test::prelude::*;
use rusty_fork::rusty_fork_test;
use crate::{
gpgme::{Context, EngineInfo, Key, LocateKey, Protocol},
@ -33,7 +33,8 @@ const PUBKEY: &[u8]=b"-----BEGIN PGP PUBLIC KEY BLOCK-----\r\nVersion: GnuPG v2.
const SECKEY: &[u8] = b"-----BEGIN PGP PRIVATE KEY BLOCK-----\r\nVersion: GnuPG v2.1.0-gitb3c71eb (GNU/Linux)\r\n\r\nlQHpBDo41NoRBADSfQazKGYf8nokq6zUKH/6INtV6MypSzSGmX2XErnARkIIPPYj\r\ncQRQ8zCbGV7ZU2ezVbzhFLUSJveE8PZUzzCrLp1O2NSyBTRcR5HVSXW95nJfY8eV\r\npOvZRAKul0BVLh81kYTsrfzaaCjh9VWNP26LoeN2r+PjZyktXe7gM3C4SwCgoTxK\r\nWUVi9HoT2HCLY7p7oig5hEcEALdCJal0UYomX3nJapIVLVZg3vkidr1RICYMb2vz\r\n58i17h8sxEtobD1vdIKNejulntaRAXs4n0tDYD9z7pRlwG1CLz1R9WxYzeOOqUDr\r\nfnVXdmU8L/oVWABat8v1V7QQhjMMf+41fuzVwDMMGqjVPLhu4X6wp3A8uyM3YDnQ\r\nVMN1A/4n2G5gHoOvjqxn8Ch5tBAdMGfO8gH4RjQOwzm2R1wPQss/yzUN1+tlMZGX\r\nK2dQ2FCWC/hDUSNaEQRlI15wxxBNZ2RQwlzE2A8v113DpvyzOtv0QO95gJ1teCXC\r\n7j/BN9asgHaBBc39JLO/TcpuI7Hf8PQ5VcP2F0UE3lczGhXbLP4HAwL0A7A1a/jY\r\n6s5JxysLUpKA31U2SrKxePmkmzYSuAiValUVdfkmLRrLSwmNJSy5NcrBHGimja1O\r\nfUUmPTg465j1+vD/tERKb2UgUmFuZG9tIEhhY2tlciAodGVzdCBrZXkgd2l0aCBw\r\nYXNzcGhyYXNlICJhYmMiKSA8am9lQGV4YW1wbGUuY29tPohiBBMRAgAiBQJNt1ep\r\nAhsjBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRCvgiRPnNn9VRwIAJ9C9I+L\r\n//3+AG/xJWsro7gOLIP6MACfcsSd8XXiPoyPCWpdOqiXZWBCfXKdAWAEOjjU3RAE\r\nAJ50lvtCGbnQlI97VX6tJkosdPmdzeXaTWfv//A2wmSANbYnuychGMa1LN43Ew+H\r\n6FXMWJ3MB/exs6UBFCgGsw88qmcla2bosQN/aVLA7fqXT9ujqoNGaIVEmgdbK1Mk\r\nSPFXBFyVW3hteod83D0UqFlltwp4A3ageCYFVJTp50d3AAMFA/44YCQQbg9x9Jvz\r\nHX3VH7CRX+raEDkDL3Pbz0PHas7bwI7gzZ+GFyNKaCvrHQOyuR8RIKIbjtQYnXr1\r\n675ConCTceIXhysY32sTn5V6UFUW2t0xaRfas8sZBbLDyIJkpt4fyD+6OaRoui9K\r\nZqXMNwt7i/XFIto/sWd/OK3SIgZkAf4HAwIoimqPHVJZM85dNw6JtvLKFvvmkm3X\r\nuoCUG5nU6cgk6vetUYiykuKpU4zG3mDtdZdIZf76hJJ6lZTSHH9frLy7bRYPfu/k\r\nU1AFd1T1OxENiEYEGBECAAYFAjo41N0ACgkQr4IkT5zZ/VVUmgCffq49ZSEJ0Zdt\r\nIvEaJth8G3t63vUAn0mBZ5GVMNMihdg3wn6qw83RgLG2iEYEGBECAAYFAjo41N4A\r\nCgkQr4IkT5zZ/VXuIgCfRaxjJRUe7Phln9bHE3nsq7YSqz0An0qXP2KbO9mhSO4T\r\n38iGvTLnq1We\r\n=m0YJ\r\n-----END PGP PRIVATE KEY BLOCK-----\r\n";
#[sealed_test]
rusty_fork_test! {
#[test]
fn test_gpgme_verify_sig() {
fn make_fut(
secret: bool,
@ -151,3 +152,4 @@ fn test_gpgme_verify_sig() {
.import_key(gpgme_ctx.new_data_mem(SECKEY).unwrap())
.unwrap_err();
}
}

12
melib/src/utils/tests.rs
View file

@ -27,12 +27,12 @@ use std::{
path::Path,
};
use sealed_test::prelude::*;
use rusty_fork::rusty_fork_test;
use tempfile::TempDir;
#[sealed_test]
#[ignore]
rusty_fork_test! {
#[test]
#[ignore]
fn test_shellexpandtrait() {
use super::shellexpand::*;
@ -150,11 +150,12 @@ fn test_shellexpandtrait() {
Completions::Entries(entries) if !entries.is_empty()));
_ = tmp_dir.close();
}
}
#[cfg(target_os = "linux")]
#[sealed_test]
#[ignore]
rusty_fork_test! {
#[test]
#[ignore]
fn test_shellexpandtrait_impls() {
use super::shellexpand::*;
@ -262,6 +263,7 @@ fn test_shellexpandtrait_impls() {
);
_ = tmp_dir.close();
}
}
// Only test on platforms that support OFD locking.
#[cfg(any(