fix tests

This commit is contained in:
Ruben Fiszel
2023-09-14 13:20:39 +02:00
parent 410b4c9cf0
commit a1fdfffb14
5 changed files with 9 additions and 4 deletions
+1 -1
View File
@@ -42,4 +42,4 @@ jobs:
mkdir frontend/build && cd backend && touch
windmill-api/openapi-deref.yaml &&
DATABASE_URL=postgres://postgres:changeme@postgres:5432/windmill cargo
test --all -- --nocapture
--features enterprise test --all -- --nocapture
@@ -35,6 +35,7 @@ static PYTHON_IMPORTS_REPLACEMENT: phf::Map<&'static str, &'static str> = phf_ma
"dateutil" => "python-dateutil",
"mailparser" => "mail-parser",
"mailparser-reply" => "mail-parser-reply",
"gitlab" => "python-gitlab"
};
fn replace_import(x: String) -> String {
+4
View File
@@ -13,6 +13,7 @@ use tokio::{
use windmill_api_client::types::{
CreateFlowBody, EditSchedule, NewSchedule, RawScript, ScriptArgs,
};
use windmill_common::worker::{WORKER_CONFIG, load_worker_config};
use windmill_common::{
flow_status::{FlowStatus, FlowStatusModule},
flows::{FlowModule, FlowModuleValue, FlowValue, InputTransform},
@@ -959,6 +960,9 @@ fn spawn_test_worker(
let tx2 = tx.clone();
let future = async move {
let base_internal_url = format!("http://localhost:{}", port);
let mut wc = WORKER_CONFIG.write().await;
*wc = load_worker_config(&db).await.unwrap();
drop(wc);
windmill_worker::run_worker::<rsmq_async::MultiplexedRsmq>(
&db,
worker_instance,
+2 -2
View File
@@ -176,7 +176,7 @@ pub async fn load_worker_config(db: &DB) -> error::Result<WorkerConfig> {
})
}
#[derive(Clone, PartialEq)]
#[derive(Clone, PartialEq, Debug)]
pub struct WorkspacedPath {
pub workspace_id: String,
pub path: String,
@@ -193,7 +193,7 @@ impl Default for WorkerConfigOpt {
}
}
#[derive(PartialEq)]
#[derive(PartialEq, Debug)]
pub struct WorkerConfig {
pub worker_tags: Vec<String>,
pub dedicated_worker: Option<WorkspacedPath>,
+1 -1
View File
@@ -608,7 +608,7 @@ pub async fn run_worker<R: rsmq_async::RsmqConnection + Send + Sync + Clone + 's
let vacuum_shift = rand::thread_rng().gen_range(0..VACUUM_PERIOD);
IS_READY.store(true, Ordering::Relaxed);
tracing::info!(worker = %worker_name, "listening for jobs");
tracing::info!(worker = %worker_name, "listening for jobs, config: {:#?}", WORKER_CONFIG.read().await);
let (dedicated_worker_tx, dedicated_worker_handle) = if let Some(_wp) =
WORKER_CONFIG.read().await.dedicated_worker.clone()