cleanup

.woodpecker.yml

@@ -2,23 +2,6 @@ variables:
   - &rust_image "rust:1.75"
 
 steps:
-
-  cargo_test:
-    image: *rust_image
-    environment:
-      LEMMY_DATABASE_URL: postgres://ibis:password@database:5432/ibis
-      CARGO_HOME: .cargo_home
-    commands:
-      - apt-get update
-      - apt-get install postgresql sudo -y --no-install-recommends --no-install-suggests
-      # dbinit (used by tests to create temp db) refuses to run as root so we need to setup another user
-      - adduser testuser
-      - cp /usr/local/rustup /home/testuser/.rustup -r
-      - chown testuser:testuser . -R
-      - chown testuser:testuser /home/testuser -R
-      - export PATH="/usr/lib/postgresql/15/bin:/usr/local/cargo/bin:$PATH"
-      - sudo -u testuser env "PATH=$PATH" cargo test --no-fail-fast test_create_read_and_edit_local_article
-
   cargo_fmt:
     image: *rust_image
     environment:
@@ -62,6 +45,22 @@ steps:
       - rustup component add clippy
       - cargo clippy --tests --all-targets --all-features
 
+  cargo_test:
+    image: *rust_image
+    environment:
+      LEMMY_DATABASE_URL: postgres://ibis:password@database:5432/ibis
+      CARGO_HOME: .cargo_home
+    commands:
+      - apt-get update
+      - apt-get install postgresql sudo -y --no-install-recommends --no-install-suggests
+      # dbinit (used by tests to create temp db) refuses to run as root so we need to setup another user
+      - adduser testuser
+      - cp /usr/local/rustup /home/testuser/.rustup -r
+      - chown testuser:testuser . -R
+      - chown testuser:testuser /home/testuser -R
+      - export PATH="/usr/lib/postgresql/15/bin:/usr/local/cargo/bin:$PATH"
+      - sudo -u testuser env "PATH=$PATH" cargo test --no-fail-fast
+
 services:
   database:
     image: postgres:15.2-alpine

tests/common.rs

@@ -107,7 +107,6 @@ impl IbisInstance {
     async fn start(db_path: String, port: i32, username: &str) -> Self {
         let database_url = format!("postgresql://ibis:password@/ibis?host={db_path}");
         let hostname = format!("localhost:{port}");
-        dbg!(&hostname);
         let bind = format!("127.0.0.1:{port}").parse().unwrap();
         let config = IbisConfig {
             bind,
@@ -120,8 +119,7 @@ impl IbisInstance {
             ..Default::default()
         };
         let handle = tokio::task::spawn(async move {
-            dbg!("do start");
+            start(config).await.unwrap();
-            dbg!(start(config).await).unwrap();
         });
         // wait a moment for the backend to start
         tokio::time::sleep(Duration::from_millis(2000)).await;
@@ -131,7 +129,6 @@ impl IbisInstance {
         };
         let client = ClientBuilder::new().cookie_store(true).build().unwrap();
         let api_client = ApiClient::new(client, hostname.clone());
-        dbg!("do register");
         api_client.register(form).await.unwrap();
         Self {
             api_client,