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.

Sign up for GitHub

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

CI: Fix overlap of keyexpr between qos tests #1636

Merged
merged 1 commit into from
Dec 6, 2024
Merged

CI: Fix overlap of keyexpr between qos tests #1636

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions zenoh/tests/qos.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ async fn qos_pubsub_overwrite_config() {
qos: {
publication: [
{
key_exprs: ["test/qos/overwritten", "test/not_applicable/**"],
key_exprs: ["test/qos_overwrite/overwritten", "test/not_applicable/**"],
config: {
congestion_control: "drop",
express: false,
Expand All @@ -100,14 +100,14 @@ async fn qos_pubsub_overwrite_config() {
let session1 = ztimeout!(zenoh::open(qos_config_overwrite)).unwrap();
let session2 = ztimeout!(zenoh::open(zenoh::Config::default())).unwrap();

let subscriber = ztimeout!(session2.declare_subscriber("test/qos/**")).unwrap();
let subscriber = ztimeout!(session2.declare_subscriber("test/qos_overwrite/**")).unwrap();
tokio::time::sleep(SLEEP).await;

// Session API tests

// Session API - overwritten PUT
ztimeout!(session1
.put("test/qos/overwritten", "qos")
.put("test/qos_overwrite/overwritten", "qos")
.congestion_control(CongestionControl::Block)
.priority(Priority::DataLow)
.express(true)
Expand All @@ -123,7 +123,7 @@ async fn qos_pubsub_overwrite_config() {

// Session API - overwritten DELETE
ztimeout!(session1
.delete("test/qos/overwritten")
.delete("test/qos_overwrite/overwritten")
.congestion_control(CongestionControl::Block)
.priority(Priority::DataLow)
.express(true)
Expand All @@ -139,7 +139,7 @@ async fn qos_pubsub_overwrite_config() {

// Session API - non-overwritten PUT
ztimeout!(session1
.put("test/qos/no_overwrite", "qos")
.put("test/qos_overwrite/no_overwrite", "qos")
.congestion_control(CongestionControl::Block)
.priority(Priority::DataLow)
.express(true)
Expand All @@ -154,7 +154,7 @@ async fn qos_pubsub_overwrite_config() {

// Session API - non-overwritten DELETE
ztimeout!(session1
.delete("test/qos/no_overwrite")
.delete("test/qos_overwrite/no_overwrite")
.congestion_control(CongestionControl::Block)
.priority(Priority::DataLow)
.express(true)
Expand All @@ -170,7 +170,7 @@ async fn qos_pubsub_overwrite_config() {
// Publisher API tests

let overwrite_config_publisher = ztimeout!(session1
.declare_publisher("test/qos/overwritten")
.declare_publisher("test/qos_overwrite/overwritten")
.congestion_control(CongestionControl::Block)
.priority(Priority::DataLow)
.express(true)
Expand All @@ -179,7 +179,7 @@ async fn qos_pubsub_overwrite_config() {
.unwrap();

let no_overwrite_config_publisher = ztimeout!(session1
.declare_publisher("test/qos/no_overwrite")
.declare_publisher("test/qos_overwrite/no_overwrite")
.congestion_control(CongestionControl::Block)
.priority(Priority::DataLow)
.express(true)
Expand Down
Loading