Compare commits
3 commits
3e12930d50
...
1a248f1dc1
| Author | SHA1 | Date | |
|---|---|---|---|
| 1a248f1dc1 | |||
| 9694ed0138 | |||
| 750dedb752 |
5 changed files with 13 additions and 7 deletions
|
|
@ -10,7 +10,7 @@ users = "0.11.0"
|
||||||
regex = "1.0.1"
|
regex = "1.0.1"
|
||||||
futures = "0.3"
|
futures = "0.3"
|
||||||
async-trait = "0.1"
|
async-trait = "0.1"
|
||||||
tokio = { version = "0.3", features = ["rt", "process", "io-util", "macros", "sync"] }
|
tokio = { version = "1.6.1", features = ["rt", "process", "io-util", "macros", "sync"] }
|
||||||
once_cell = "1.4"
|
once_cell = "1.4"
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ use crate::resources::{
|
||||||
Resource, ServeCustom, ServePhp, ServeRedir, ServeService, ServeStatic, StoredDirectory,
|
Resource, ServeCustom, ServePhp, ServeRedir, ServeService, ServeStatic, StoredDirectory,
|
||||||
SystemdSocketService, User, UserForDomain, WordpressPlugin, WordpressTranslation,
|
SystemdSocketService, User, UserForDomain, WordpressPlugin, WordpressTranslation,
|
||||||
};
|
};
|
||||||
use crate::static_files::LETS_ENCRYPT_X3_CROSS_SIGNED;
|
use crate::static_files::LETS_ENCRYPT_R3_CROSS_SIGNED;
|
||||||
use crate::storage::SimpleStorage;
|
use crate::storage::SimpleStorage;
|
||||||
use crate::storage::Storage;
|
use crate::storage::Storage;
|
||||||
use crate::symbols::acme::Cert as CertSymbol;
|
use crate::symbols::acme::Cert as CertSymbol;
|
||||||
|
|
@ -676,7 +676,7 @@ impl ImplementationBuilder<AcmeRootCert> for DefaultBuilder {
|
||||||
target: &<AcmeRootCert as Resource>::Artifact,
|
target: &<AcmeRootCert as Resource>::Artifact,
|
||||||
(): <Self::Prerequisites as ToArtifact>::Artifact,
|
(): <Self::Prerequisites as ToArtifact>::Artifact,
|
||||||
) -> Self::Implementation {
|
) -> Self::Implementation {
|
||||||
FileSymbol::new(target.clone().into(), LETS_ENCRYPT_X3_CROSS_SIGNED)
|
FileSymbol::new(target.clone().into(), LETS_ENCRYPT_R3_CROSS_SIGNED)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@
|
||||||
clippy::future_not_send,
|
clippy::future_not_send,
|
||||||
clippy::missing_errors_doc,
|
clippy::missing_errors_doc,
|
||||||
clippy::module_name_repetitions,
|
clippy::module_name_repetitions,
|
||||||
rustdoc,
|
rustdoc::all,
|
||||||
missing_docs,
|
missing_docs,
|
||||||
missing_copy_implementations
|
missing_copy_implementations
|
||||||
)]
|
)]
|
||||||
|
|
|
||||||
|
|
@ -243,7 +243,7 @@ impl<P: Policy> ResourceLocator<AcmeRootCert> for DefaultLocator<P> {
|
||||||
let acme_user = P::acme_user();
|
let acme_user = P::acme_user();
|
||||||
let home = P::user_home(acme_user);
|
let home = P::user_home(acme_user);
|
||||||
(
|
(
|
||||||
PathArtifact::from(home.join("lets_encrypt_x3_cross_signed.pem")),
|
PathArtifact::from(home.join("lets_encrypt_r3_cross_signed.pem")),
|
||||||
Dir(home),
|
Dir(home),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -136,14 +136,20 @@ mod test {
|
||||||
let start = Instant::now();
|
let start = Instant::now();
|
||||||
assert!(run(checkout.target_reached()).unwrap());
|
assert!(run(checkout.target_reached()).unwrap());
|
||||||
let end = Instant::now();
|
let end = Instant::now();
|
||||||
|
let mut args = c.args.into_inner();
|
||||||
|
let first_two_args = &mut args[0..2];
|
||||||
|
first_two_args.sort_unstable();
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
c.args.into_inner(),
|
first_two_args,
|
||||||
[
|
[
|
||||||
["-C", "target", "fetch", "source", "branch"],
|
["-C", "target", "fetch", "source", "branch"],
|
||||||
["-C", "target", "rev-list", "-1", "HEAD"],
|
["-C", "target", "rev-list", "-1", "HEAD"],
|
||||||
["-C", "target", "rev-list", "-1", "FETCH_HEAD"]
|
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
|
drop(first_two_args);
|
||||||
|
assert_eq!(args[2],
|
||||||
|
["-C", "target", "rev-list", "-1", "FETCH_HEAD"]);
|
||||||
|
|
||||||
assert!((end - start).as_millis() >= 100);
|
assert!((end - start).as_millis() >= 100);
|
||||||
assert!((end - start).as_millis() < 150);
|
assert!((end - start).as_millis() < 150);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue