Update file name

metno · Jun 26, 2024 · 9084788 · 9084788
1 parent d8e0a02
commit 9084788
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -60,7 +60,7 @@ jobs:
         run: cargo clippy --workspace -- -D warnings
 
       - name: Prepare PostgreSQL
-        run: target/debug/prepare_db
+        run: target/debug/prepare_postgres
 
       - name: Run unit and integration tests
         run: cargo test --no-fail-fast -- --nocapture --test-threads=1
diff --git a/integration_tests/Cargo.toml b/integration_tests/Cargo.toml
@@ -17,7 +17,7 @@ futures.workspace = true
 reqwest = {version = "0.12.4", features = ["json"]}
 
 [[bin]]
-name = "prepare_db"
+name = "prepare_postgres"
 path = "src/main.rs"
 test = false
 bench = false
diff --git a/integration_tests/Makefile b/integration_tests/Makefile
@@ -1,17 +1,19 @@
-test: setup
+test_all: _test_dummy clean
+_test_dummy: setup
 	cargo test --no-fail-fast -- --nocapture --test-threads=1
-	@make clean
 
-end-to-end: setup
-	cargo test --test end-to-end --no-fail-fast -- --nocapture --test-threads=1
-	@make clean
+e2e := end_to_end
+$(e2e): _e2e_dummy clean
+_e2e_dummy: setup
+	cargo test --test $(e2e) --no-fail-fast -- --nocapture --test-threads=1
 
 setup:
 	@echo "Starting Postgres docker container..."
 	docker run --name lard_tests -e POSTGRES_PASSWORD=postgres -p 5432:5432 -d postgres
-	@sleep 5
+	@echo; sleep 5
 	cargo build --workspace --tests
-	cd ..; target/debug/prepare_db
+	@echo; echo "Loading DB schema..."; echo
+	@cd ..; target/debug/prepare_postgres
 
 clean:
 	@echo "Stopping Postgres container..."

diff --git a/integration_tests/tests/end-to-end.rs → integration_tests/tests/end_to_end.rs b/integration_tests/tests/end-to-end.rs → integration_tests/tests/end_to_end.rs