Create test workload

crates/xtask/src/bench/command.rs

@@ -5,8 +5,8 @@ use std::io::Read as _;
 use anyhow::{bail, Context as _};
 use serde::Deserialize;
 
-use super::assets::{fetch_asset, Asset};
+use crate::common::assets::{fetch_asset, Asset};
-use super::client::{Client, Method};
+use crate::common::client::{Client, Method};
 
 #[derive(Clone, Deserialize)]
 pub struct Command {

crates/xtask/src/bench/dashboard.rs

@@ -7,9 +7,9 @@ use tokio::task::AbortHandle;
 use tracing_trace::processor::span_stats::CallStats;
 use uuid::Uuid;
 
-use super::client::Client;
 use super::env_info;
 use super::workload::Workload;
+use crate::common::client::Client;
 
 #[derive(Debug, Clone)]
 pub enum DashboardClient {

crates/xtask/src/bench/meili_process.rs

@@ -5,9 +5,9 @@ use anyhow::{bail, Context as _};
 use tokio::process::Command;
 use tokio::time;
 
-use super::assets::Asset;
-use super::client::Client;
 use super::workload::Workload;
+use crate::common::assets::Asset;
+use crate::common::client::Client;
 
 pub async fn kill(mut meilisearch: tokio::process::Child) {
     let Some(id) = meilisearch.id() else { return };
@@ -125,7 +125,7 @@ async fn wait_for_health(
 fn health_command() -> super::command::Command {
     super::command::Command {
         route: "/health".into(),
-        method: super::client::Method::Get,
+        method: crate::common::client::Method::Get,
         body: Default::default(),
         synchronous: super::command::SyncMode::WaitForResponse,
     }

crates/xtask/src/bench/mod.rs

@@ -1,5 +1,3 @@
-mod assets;
-mod client;
 mod command;
 mod dashboard;
 mod env_info;
@@ -13,8 +11,8 @@ use std::path::PathBuf;
 use anyhow::Context;
 use clap::Parser;
 
-use self::client::Client;
 use self::workload::Workload;
+use crate::common::client::Client;
 
 pub fn default_http_addr() -> String {
     "127.0.0.1:7700".to_string()

crates/xtask/src/bench/workload.rs

@@ -10,13 +10,15 @@ use serde_json::json;
 use tokio::task::JoinHandle;
 use uuid::Uuid;
 
-use super::assets::Asset;
-use super::client::Client;
 use super::command::SyncMode;
 use super::dashboard::DashboardClient;
 use super::BenchDeriveArgs;
-use crate::bench::{assets, meili_process};
+use crate::bench::meili_process;
+use crate::common::assets::{self, Asset};
+use crate::common::client::Client;
 
+/// A bench workload.
+/// Not to be confused with [a test workload](crate::test::workload::Workload).
 #[derive(Deserialize)]
 pub struct Workload {
     pub name: String,

crates/xtask/src/common/mod.rs

@@ -1,2 +1,4 @@
 pub mod args;
+pub mod assets;
+pub mod client;
 pub mod logs;

crates/xtask/src/test/mod.rs

@@ -2,6 +2,8 @@ use clap::Parser;
 
 use crate::common::{args::CommonArgs, logs::setup_logs};
 
+mod workload;
+
 /// Run tests from a workload
 #[derive(Parser, Debug)]
 pub struct TestDeriveArgs {

crates/xtask/src/test/workload.rs

@@ -0,0 +1,12 @@
+use std::collections::BTreeMap;
+use serde::Deserialize;
+
+use crate::common::assets::Asset;
+
+/// A test workload.
+/// Not to be confused with [a bench workload](crate::bench::workload::Workload).
+#[derive(Deserialize)]
+pub struct Workload {
+    pub name: String,
+    pub assets: BTreeMap<String, Asset>,
+}