From aab20622e10dd7742c2a3a64adcde5584aa51cf3 Mon Sep 17 00:00:00 2001
From: Varsha GS <varsha.gs@ibm.com>
Date: Fri, 25 Oct 2024 21:12:13 +0530
Subject: [PATCH] fix(currency): run only starlette tests in `gevent_starlette`
 task

Signed-off-by: Varsha GS <varsha.gs@ibm.com>
---
 .circleci/config.yml     | 10 ++++++----
 .tekton/pipeline.yaml    | 29 ++++++++++++++---------------
 .tekton/run_unittests.sh |  6 ++++--
 tests/conftest.py        |  6 +++---
 4 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9cc2bc7b..fcf45307 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -327,8 +327,10 @@ jobs:
       - pip-install-deps:
           requirements: "tests/requirements-gevent-starlette.txt"
       - run-tests-with-coverage-report:
-          gevent: "true"
-          tests: "tests/frameworks/test_gevent.py tests/frameworks/test_starlette.py"
+          # TODO: uncomment once gevent instrumentation is done
+          # gevent: "true"
+          # tests: "tests/frameworks/test_gevent.py tests/frameworks/test_starlette.py"
+          tests: "tests/frameworks/test_starlette.py"
       - store-pytest-results
       - store-coverage-report
 
@@ -344,7 +346,7 @@ workflows:
       - python313
       - py39cassandra
       - py39couchbase
-      # - py39gevent_starlette
+      - py39gevent_starlette
       - py312aws
       - final_job:
           requires:
@@ -356,5 +358,5 @@ workflows:
             - python313
             - py39cassandra
             - py39couchbase
-            # - py39gevent_starlette
+            - py39gevent_starlette
             - py312aws
diff --git a/.tekton/pipeline.yaml b/.tekton/pipeline.yaml
index e359babf..9620f2a7 100644
--- a/.tekton/pipeline.yaml
+++ b/.tekton/pipeline.yaml
@@ -70,21 +70,20 @@ spec:
       workspaces:
         - name: task-pvc
           workspace: python-tracer-ci-pipeline-pvc
-    # TODO: uncomment after gevent instrumentation is complete
-    # - name: unittest-gevent-starlette
-    #   runAfter:
-    #     - clone
-    #   matrix:
-    #     params:
-    #       - name: imageDigest
-    #         value:
-    #           # 3.9.20-bookworm
-    #           - "sha256:dbb0be5b67aa84b9e3e4f325c7844ab439f40a5cca717c5b24e671cfb41dbb46"
-    #   taskRef:
-    #     name: python-tracer-unittest-gevent-starlette-task
-    #   workspaces:
-    #     - name: task-pvc
-    #       workspace: python-tracer-ci-pipeline-pvc
+    - name: unittest-gevent-starlette
+      runAfter:
+        - clone
+      matrix:
+        params:
+          - name: imageDigest
+            value:
+              # 3.9.20-bookworm
+              - "sha256:dbb0be5b67aa84b9e3e4f325c7844ab439f40a5cca717c5b24e671cfb41dbb46"
+      taskRef:
+        name: python-tracer-unittest-gevent-starlette-task
+      workspaces:
+        - name: task-pvc
+          workspace: python-tracer-ci-pipeline-pvc
     - name: unittest-aws
       runAfter:
         - clone
diff --git a/.tekton/run_unittests.sh b/.tekton/run_unittests.sh
index fd03ac13..24bdf4e9 100755
--- a/.tekton/run_unittests.sh
+++ b/.tekton/run_unittests.sh
@@ -29,8 +29,10 @@ couchbase)
   export COUCHBASE_TEST='true' ;;
 gevent_starlette)
   export REQUIREMENTS='requirements-gevent-starlette.txt'
-  export TESTS=('tests/frameworks/test_gevent.py' 'tests/frameworks/test_starlette.py')
-  export GEVENT_STARLETTE_TEST='true' ;;
+  # TODO: uncomment once gevent instrumentation is done
+  # export TESTS=('tests/frameworks/test_gevent.py' 'tests/frameworks/test_starlette.py')
+  # export GEVENT_STARLETTE_TEST='true' ;;
+  export TESTS=('tests/frameworks/test_starlette.py');;
 aws)
   export REQUIREMENTS='requirements.txt'
   export TESTS=('tests_aws') ;;
diff --git a/tests/conftest.py b/tests/conftest.py
index 40068350..56fdf534 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -38,9 +38,9 @@
 if not os.environ.get("COUCHBASE_TEST"):
     collect_ignore_glob.append("*test_couchbase*")
 
-# if not os.environ.get("GEVENT_STARLETTE_TEST"):
-#     collect_ignore_glob.append("*test_gevent*")
-#     collect_ignore_glob.append("*test_starlette*")
+if not os.environ.get("GEVENT_STARLETTE_TEST"):
+    collect_ignore_glob.append("*test_gevent*")
+    collect_ignore_glob.append("*test_starlette*")
 
 
 if sys.version_info >= (3, 13):