mirror of
https://github.com/rwf2/Rocket.git
synced 2024-12-31 23:02:37 +00:00
4e06ee64aa
Prior to this commit, it was not possible to test Rocket crates in production mode without setting a global secret key or bypassing secret key checking - the testing script did the latter. The consequence is that it became impossible to test secret key related failures because the tests passed regardless. This commit undoes this. As a consequence, all tests are now aware of the difference between debug and release configurations, the latter of which validates 'secret_key' by default. New 'Client::debug()' and 'Client::debug_with()' simplify creating an instance of 'Client' with configuration in debug mode to avoid undesired test failures. The summary of changes in this commit are: * Config 'secret_key' success and failure are now tested. * 'secret_key' validation was moved to pre-launch from 'Config:from()'. * 'Config::from()' only extracts the config. * Added 'Config::try_from()' for non-panicking extraction. * 'Config' now knows the profile it was extracted from. * The 'Config' provider sets a profile of 'Config.profile'. * 'Rocket', 'Client', 'Fairings', implement 'Debug'. * 'fairing::Info' implements 'Copy', 'Clone'. * 'Fairings' keeps track of, logs attach fairings. * 'Rocket::reconfigure()' was added to allow modifying a config. Internally, the testing script was refactored to properly test the codebase with the new changes. In particular, it no longer sets a rustc 'cfg' to avoid secret-key checking. Resolves #1543. Fixes #1564.
73 lines
1.8 KiB
Rust
73 lines
1.8 KiB
Rust
#[macro_use] extern crate rocket;
|
|
#[macro_use] extern crate bencher;
|
|
|
|
#[get("/", format = "application/json", rank = 1)]
|
|
fn get() -> &'static str { "json" }
|
|
|
|
#[get("/", format = "text/html", rank = 2)]
|
|
fn get2() -> &'static str { "html" }
|
|
|
|
#[get("/", format = "text/plain", rank = 3)]
|
|
fn get3() -> &'static str { "plain" }
|
|
|
|
#[post("/", format = "application/json")]
|
|
fn post() -> &'static str { "json" }
|
|
|
|
#[post("/", format = "text/html")]
|
|
fn post2() -> &'static str { "html" }
|
|
|
|
#[post("/", format = "text/plain")]
|
|
fn post3() -> &'static str { "plain" }
|
|
|
|
fn rocket() -> rocket::Rocket {
|
|
let config = rocket::Config {
|
|
log_level: rocket::config::LogLevel::Off,
|
|
..rocket::Config::debug_default()
|
|
};
|
|
|
|
rocket::custom(config)
|
|
.mount("/", routes![get, get2, get3])
|
|
.mount("/", routes![post, post2, post3])
|
|
}
|
|
|
|
use bencher::Bencher;
|
|
use rocket::local::blocking::Client;
|
|
use rocket::http::{Accept, ContentType};
|
|
|
|
fn accept_format(b: &mut Bencher) {
|
|
let client = Client::tracked(rocket()).unwrap();
|
|
let requests = vec![
|
|
client.get("/").header(Accept::JSON),
|
|
client.get("/").header(Accept::HTML),
|
|
client.get("/").header(Accept::Plain),
|
|
];
|
|
|
|
b.iter(|| {
|
|
for request in &requests {
|
|
request.clone().dispatch();
|
|
}
|
|
});
|
|
}
|
|
|
|
fn content_type_format(b: &mut Bencher) {
|
|
let client = Client::tracked(rocket()).unwrap();
|
|
let requests = vec![
|
|
client.post("/").header(ContentType::JSON),
|
|
client.post("/").header(ContentType::HTML),
|
|
client.post("/").header(ContentType::Plain),
|
|
];
|
|
|
|
b.iter(|| {
|
|
for request in &requests {
|
|
request.clone().dispatch();
|
|
}
|
|
});
|
|
}
|
|
|
|
benchmark_main!(benches);
|
|
benchmark_group! {
|
|
benches,
|
|
accept_format,
|
|
content_type_format,
|
|
}
|