From 7318b35fcb36d8cffdd525b40b74e8eb7f873c49 Mon Sep 17 00:00:00 2001
From: Alexander Todorov <atodorov@otb.bg>
Date: Mon, 22 Sep 2025 11:55:09 +0300
Subject: [PATCH 1/3] Replace setup.py test with pytest

---
 .github/workflows/integration.yml |  4 ----
 Makefile                          | 10 +++-------
 appveyor.yml                      |  2 +-
 devel.txt                         |  2 +-
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index b6b0892..2be735b 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -116,7 +116,3 @@ jobs:
         name: logs
         path: /tmp/*.log
         if-no-files-found: ignore
-
-    - name: Submit coverage report
-      run: |
-        codecov --token=cf379ef9-76c2-4aa9-9bf5-5c01303222e0
diff --git a/Makefile b/Makefile
index c598193..0ccebc9 100644
--- a/Makefile
+++ b/Makefile
@@ -11,11 +11,7 @@ pylint:
 
 .PHONY: test
 test:
-	python -m coverage run --source tcms_api setup.py test
-
-.PHONY: test-codecov
-test-codecov: test
-	codecov
+	pytest -v --ignore=tests/krb5/ tests/
 
 .PHONY: build
 build:
@@ -44,11 +40,11 @@ run-services:
 
 .PHONY: verify-integration
 verify-integration:
-	PYTHONPATH=. python -m coverage run --source tcms_api ./tests/krb5/integration_test.py
+	PYTHONPATH=. pytest -v ./tests/krb5/integration_test.py
 
 .PHONY: verify-credentials-via-python
 verify-credentials-via-python:
-	PYTHONPATH=. python -m coverage run --source tcms_api ./tests/krb5/python_credentials_test.py
+	PYTHONPATH=. pytest -v ./tests/krb5/python_credentials_test.py
 
 .PHONY: verify-curl-with-kerberos
 verify-curl-with-kerberos:
diff --git a/appveyor.yml b/appveyor.yml
index 5927ca9..09b40ad 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,7 +9,7 @@ environment:
   matrix:
     - MAKE: flake8
     - MAKE: pylint
-    - MAKE: test-codecov
+    - MAKE: test
     - MAKE: build
 
 install:
diff --git a/devel.txt b/devel.txt
index 66bb4d2..35abdf9 100644
--- a/devel.txt
+++ b/devel.txt
@@ -1,7 +1,7 @@
 -r requirements.txt
 
 build
-codecov
 flake8
 pylint
+pytest
 twine

From 099649fa09606edce8c70dc561b8d1e3528cf979 Mon Sep 17 00:00:00 2001
From: Alexander Todorov <atodorov@otb.bg>
Date: Mon, 22 Sep 2025 12:20:35 +0300
Subject: [PATCH 2/3] Uploaded artifact names must be unique

---
 .github/workflows/integration.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 2be735b..0cfc239 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -113,6 +113,6 @@ jobs:
       uses: actions/upload-artifact@v4
       if: always()
       with:
-        name: logs
+        name: logs-${{ matrix.gssapi }}-gssapi
         path: /tmp/*.log
         if-no-files-found: ignore

From 6d8b8b92d78aec3aa0ce12bbdfc330c2e67e53f5 Mon Sep 17 00:00:00 2001
From: Alexander Todorov <atodorov@otb.bg>
Date: Mon, 22 Sep 2025 12:22:42 +0300
Subject: [PATCH 3/3] Update grep expression b/c of upstream URL change

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 0ccebc9..c9179a2 100644
--- a/Makefile
+++ b/Makefile
@@ -64,4 +64,4 @@ verify-web-login: verify-curl-with-kerberos
 	cat /tmp/curl.log | grep 'Your Test plans'
 
 	# verify username is 'travis', e.g. taken from 'travis@KIWITCMS.ORG' principal
-	cat /tmp/curl.log | grep '<a href="/accounts/travis/profile/" target="_parent">My profile</a>'
+	cat /tmp/curl.log | grep '/plan/search/?author=travis'