Merge pull request #34 from NHSDigital/APM-6127-refactor-tests-to-use-test-utils-2

APM-6127 refactor tests to use pytest nhsd apim package

Author: koppuravuris

.gitignore

@@ -1,4 +1,5 @@
 node_modules/
+
 bin/
 dist/
 build/
@@ -12,5 +13,6 @@ __pycache__/
 .envrc
 .idea/
 .venv/
+.direnv/
 
 smoketest-report.xml

Makefile

@@ -45,10 +45,18 @@ release: clean publish build-proxy
 	mkdir -p dist
 	for f in $(_dist_include); do cp -r $$f dist; done
 
+TEST_CMD := @APIGEE_ACCESS_TOKEN=$(APIGEE_ACCESS_TOKEN) \
+		poetry run pytest -v \
+		--color=yes \
+		--api-name=splunk-monitor \
+		--proxy-name=$(PROXY_NAME) \
+		-s
+
 test:
-#	this target should be used for local unit tests ..  runs as part of the build pipeline
-	make --no-print-directory -C test
+	$(TEST_CMD) \
+	--junitxml=test-report.xml \
 
 smoketest:
-#	this target is for end to end smoketests this would be run 'post deploy' to verify an environment is working
-	poetry run pytest -v --junitxml=smoketest-report.xml -s -m smoketest
+	$(TEST_CMD) \
+	--junitxml=smoketest-report.xml \
+	-m smoketest

azure/templates/run-smoke-tests.yml

@@ -5,11 +5,9 @@ steps:
     displayName: Setup pytests
 
   - bash: |
-      export RELEASE_RELEASEID=$(Build.BuildId)
-      export SOURCE_COMMIT_ID=$(Build.SourceVersion)
-      export APIGEE_ENVIRONMENT="$(ENVIRONMENT)"
-      export SERVICE_BASE_PATH="$(SERVICE_BASE_PATH)"
-      export STATUS_ENDPOINT_API_KEY="$(status-endpoint-api-key)"
+      export PROXY_NAME="$(FULLY_QUALIFIED_SERVICE_NAME)"
+      export APIGEE_ACCESS_TOKEN="$(secret.AccessToken)"
+      export SOURCE_COMMIT_ID="$(Build.SourceVersion)"
 
       make smoketest
     workingDirectory: $(Pipeline.Workspace)/s/$(SERVICE_NAME)/$(SERVICE_ARTIFACT_NAME)

poetry.lock

@@ -15,6 +15,8 @@ package-mode = false
 
 [tool.poetry.dependencies]
 python = "^3.9"
+pytest-nhsd-apim = "^4.0.1"
+requests = "^2.32.3"
 
 [tool.poetry.group.dev.dependencies]
 flake8 = "^7.1.2"
@@ -26,10 +28,9 @@ docopt = "^0.6.2"
 jsonpath-rw = "^1.4.0"
 semver = "^3.0.2"
 gitpython = "^3.1.34"
-pytest = "^6.1.2"
+pytest = "^8.2.0"
 coverage = "^5.5"
 aiohttp = "^3.10.11"
 pytest-asyncio = "^0.14.0"
-api-test-utils = {url = "https://github.com/NHSDigital/apim-test-utils/releases/download/v1.1.43-alpha/api_test_utils-1.1.43a0-py3-none-any.whl"}
 
 [tool.poetry.scripts]