From a1fdfffb14646164a96837d167a06afdf921bfcd Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Thu, 14 Sep 2023 13:20:39 +0200
Subject: [PATCH] fix tests

---
 .github/workflows/backend-test.yml                    | 2 +-
 backend/parsers/windmill-parser-py-imports/src/lib.rs | 1 +
 backend/tests/worker.rs                               | 4 ++++
 backend/windmill-common/src/worker.rs                 | 4 ++--
 backend/windmill-worker/src/worker.rs                 | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/backend-test.yml b/.github/workflows/backend-test.yml
index d89c3fa56e..7b4c09b46c 100644
--- a/.github/workflows/backend-test.yml
+++ b/.github/workflows/backend-test.yml
@@ -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
diff --git a/backend/parsers/windmill-parser-py-imports/src/lib.rs b/backend/parsers/windmill-parser-py-imports/src/lib.rs
index b7d0719c55..d2a590e897 100644
--- a/backend/parsers/windmill-parser-py-imports/src/lib.rs
+++ b/backend/parsers/windmill-parser-py-imports/src/lib.rs
@@ -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 {
diff --git a/backend/tests/worker.rs b/backend/tests/worker.rs
index 30bbd861bb..3f96f93aca 100644
--- a/backend/tests/worker.rs
+++ b/backend/tests/worker.rs
@@ -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,
diff --git a/backend/windmill-common/src/worker.rs b/backend/windmill-common/src/worker.rs
index 2dc7fa9de3..f29e7ca314 100644
--- a/backend/windmill-common/src/worker.rs
+++ b/backend/windmill-common/src/worker.rs
@@ -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>,
diff --git a/backend/windmill-worker/src/worker.rs b/backend/windmill-worker/src/worker.rs
index 1832a31b09..f066eccd96 100644
--- a/backend/windmill-worker/src/worker.rs
+++ b/backend/windmill-worker/src/worker.rs
@@ -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()