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

update crates used by goose #574

Merged
merged 5 commits into from
Dec 18, 2023
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: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## 0.17.3-dev
- [#565](https://github.com/tag1consulting/goose/pull/565) add `--accept-invalid-certs` to skip validation of https certificates
- [#568](https://github.com/tag1consulting/goose/pull/568) don't panic when truncating non utf-8 string
- [#574](https://github.com/tag1consulting/goose/pull/574) update [`http`](https://docs.rs/http), [`itertools`](https://docs.rs/itertools) [`nix`](https://docs.rs/nix), [`rustls`](https://docs.rs/rustls/), and [`serial_test`](https://docs.rs/serial_test)

## 0.17.2 August 28, 2023
- [#557](https://github.com/tag1consulting/goose/pull/557) speed up user initialization on Linux
Expand Down
10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ downcast-rs = "1.2"
flume = "0.11"
futures = "0.3"
gumdrop = "0.8"
http = "0.2"
itertools = "0.11"
http = "1.0"
itertools = "0.12"
lazy_static = "1.4"
log = "0.4"
num-format = "0.4"
Expand Down Expand Up @@ -58,6 +58,6 @@ rustls-tls = ["reqwest/rustls-tls", "tokio-tungstenite/rustls"]
[dev-dependencies]
httpmock = "0.6"
native-tls = "0.2"
nix = "0.26"
rustls = "0.20"
serial_test = "0.9"
nix = "0.27"
rustls = "0.22"
serial_test = "2.0"
3 changes: 1 addition & 2 deletions src/goose.rs
Original file line number Diff line number Diff line change
Expand Up @@ -288,9 +288,8 @@
//! limitations under the License.

use downcast_rs::{impl_downcast, Downcast};
use http::method::Method;
use regex::Regex;
use reqwest::{header, Client, ClientBuilder, RequestBuilder, Response};
use reqwest::{header, Client, ClientBuilder, Method, RequestBuilder, Response};
use serde::{Deserialize, Serialize};
use std::hash::{Hash, Hasher};
use std::sync::Arc;
Expand Down
4 changes: 2 additions & 2 deletions src/metrics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ use crate::test_plan::{TestPlanHistory, TestPlanStepAction};
use crate::util;
use crate::{GooseAttack, GooseAttackRunState, GooseConfiguration, GooseError};
use chrono::prelude::*;
use http::StatusCode;
use itertools::Itertools;
use num_format::{Locale, ToFormattedString};
use regex::RegexSet;
use reqwest::StatusCode;
use serde::ser::SerializeStruct;
use serde::{Deserialize, Serialize, Serializer};
use std::cmp::Ordering;
Expand Down Expand Up @@ -3872,7 +3872,7 @@ mod test {
assert!(request_metric.success);
assert!(!request_metric.update);

let status_code = http::StatusCode::OK;
let status_code = reqwest::StatusCode::OK;
request_metric.set_status_code(Some(status_code));
assert_eq!(request_metric.raw.method, GooseMethod::Get);
assert_eq!(request_metric.name, "/".to_string());
Expand Down
1 change: 0 additions & 1 deletion tests/one_taskset.rs
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,6 @@ async fn test_one_scenario_reset_metrics() {
run_standalone_test(TestType::ResetMetrics).await;
}

#[ignore]
#[tokio::test(flavor = "multi_thread", worker_threads = 8)]
#[cfg_attr(not(feature = "gaggle"), ignore)]
#[serial]
Expand Down
Loading