Merge pull request #46 from sjyothi54/revert-45-integration_testing

Revert "Integration testing"
newrelic · Jan 16, 2025 · 46847de · 46847de
2 parents 4714ac5 + 11cc6b8
commit 46847de
Show file tree

Hide file tree

Showing 20 changed files with 71 additions and 1,548 deletions.
diff --git a/Makefile b/Makefile
@@ -30,17 +30,9 @@ test:
 
 integration-test:
 	@echo "=== $(INTEGRATION) === [ test ]: running integration tests..."
-	@docker compose -f tests/docker-compose.yml up -d
-	@sleep 10
-	@go test -v -tags=integration -count 1 ./tests/postgresql_test.go -timeout 300s || (ret=$$?; docker compose -f tests/docker-compose.yml down -v && exit $$ret)
-	@docker compose -f tests/docker-compose.yml down -v
-	@echo "=== $(INTEGRATION) === [ test ]: running integration tests for query performance monitoring..."
-	@echo "Starting containers for performance tests..."
-	@docker compose -f tests/docker-compose-performance.yml up -d
-	@sleep 30
-	@go test -v -tags=query_performance ./tests/postgresqlperf_test.go -timeout 600s || (ret=$$?; docker compose -f tests/docker-compose-performance.yml down -v && exit $$ret)
-	@echo "Stopping performance test containers..."
-	@docker compose -f tests/docker-compose-performance.yml down -v
+	@docker compose -f tests/docker-compose.yml pull
+	@go test -v -tags=integration -count 1 ./tests/. || (ret=$$?; docker compose -f tests/docker-compose.yml down && exit $$ret)
+	@docker compose -f tests/docker-compose.yml down
 
 install: compile
 	@echo "=== $(INTEGRATION) === [ install ]: installing bin/$(BINARY_NAME)..."

diff --git a/tests/docker-compose-performance.yml b/tests/docker-compose-performance.yml
diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml
@@ -2,7 +2,6 @@ services:
   postgres-9-6:
     image: postgres:9.6
     restart: always
-    container_name: postgres-9-6
     environment:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: example
@@ -11,14 +10,18 @@ services:
   postgres-latest-supported:
     image: postgres:17.0
     restart: always
-    container_name: postgres-latest-supported
     environment:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: example
       POSTGRES_DB: demo
 
   nri-postgresql:
-    container_name: nri-postgresql
-    build:
-      context: ../
-      dockerfile: tests/perf-testing/integration/Dockerfile
+    image: golang:1.23.4-bookworm
+    container_name: nri_postgresql
+    working_dir: /code
+    depends_on:
+      - postgres-9-6
+      - postgres-latest-supported
+    volumes:
+      - ../:/code
+    entrypoint: go run /code/src/main.go
diff --git a/tests/perf-testing/integration/Dockerfile b/tests/perf-testing/integration/Dockerfile
diff --git a/tests/perf-testing/latest_supported/01-init-extensions.sql b/tests/perf-testing/latest_supported/01-init-extensions.sql
diff --git a/tests/perf-testing/latest_supported/02-create-database.sql b/tests/perf-testing/latest_supported/02-create-database.sql
diff --git a/tests/perf-testing/latest_supported/03-import-data.sql b/tests/perf-testing/latest_supported/03-import-data.sql
diff --git a/tests/perf-testing/latest_supported/Dockerfile b/tests/perf-testing/latest_supported/Dockerfile
diff --git a/tests/perf-testing/oldest_supported/01-init-extensions.sql b/tests/perf-testing/oldest_supported/01-init-extensions.sql
diff --git a/tests/perf-testing/oldest_supported/02-create-database.sql b/tests/perf-testing/oldest_supported/02-create-database.sql
diff --git a/tests/perf-testing/oldest_supported/03-import-data.sql b/tests/perf-testing/oldest_supported/03-import-data.sql
diff --git a/tests/perf-testing/oldest_supported/Dockerfile b/tests/perf-testing/oldest_supported/Dockerfile