tests: Modify gevent_autotrace

Signed-off-by: Varsha GS <varsha.gs@ibm.com>

Author: GSVarsha

tests/conftest.py

@@ -28,7 +28,6 @@
 collect_ignore_glob = [
     "*collector/test_gcr*",
     "*agent/test_google*",
-    "*test_gevent_autotrace*"
 ]
 
 # ppc64le and s390x have limitations with some supported libraries.
@@ -54,7 +53,7 @@
 if not os.environ.get("GEVENT_STARLETTE_TEST"):
     collect_ignore_glob.extend(
         [
-            "*test_gevent.py",
+            "*test_gevent*",
         ]
     )
 

tests/frameworks/test_gevent_autotrace.py

@@ -3,27 +3,31 @@
 
 import importlib
 import os
-import unittest
-import socket
+import pytest
 
 import gevent
 from gevent import monkey
 from instana import apply_gevent_monkey_patch
 
+# Teardown not working as expected, run each testcase separately
+class TestGEventAutoTrace:
 
-class TestGEventAutoTrace(unittest.TestCase):
-    def setUp(self):
+    @pytest.fixture(autouse=True)
+    def setup_environment(self):
+        """Setup test environment before each test"""
         # Ensure that the test suite is operational even when Django is installed
         # but not running or configured
         os.environ['DJANGO_SETTINGS_MODULE'] = ''
-
+        
         self.default_patched_modules = ('socket', 'time', 'select', 'os',
                 'threading', 'ssl', 'subprocess', 'signal', 'queue',)
-
-    def tearDown(self):
+        
+        yield
+        
+        # Teardown
         if os.environ.get('INSTANA_GEVENT_MONKEY_OPTIONS'):
             os.environ.pop('INSTANA_GEVENT_MONKEY_OPTIONS')
-
+        
         # Clean up after gevent monkey patches, by restore from the saved dict
         for modname in monkey.saved.keys():
             try:
@@ -35,37 +39,34 @@ def tearDown(self):
                 pass
         monkey.saved = {}
 
-
     def test_default_patch_all(self):
         apply_gevent_monkey_patch()
         for module_name in self.default_patched_modules:
-            self.assertTrue(monkey.is_module_patched(module_name),
-                            f"{module_name} is not patched")
+            assert monkey.is_module_patched(module_name), f"{module_name} is not patched"
 
     def test_instana_monkey_options_only_time(self):
         os.environ['INSTANA_GEVENT_MONKEY_OPTIONS'] = (
                 'time,no-socket,no-select,no-os,no-select,no-threading,no-os,'
                 'no-ssl,no-subprocess,''no-signal,no-queue')
         apply_gevent_monkey_patch()
-
-        self.assertTrue(monkey.is_module_patched('time'), "time module is not patched")
+        
+        assert monkey.is_module_patched('time'), "time module is not patched"
         not_patched_modules = (m for m in self.default_patched_modules if m not in ('time', 'threading'))
-
+        
         for module_name in not_patched_modules:
-            self.assertFalse(monkey.is_module_patched(module_name),
-                             f"{module_name} is patched, when it shouldn't be")
-
+            assert not monkey.is_module_patched(module_name), \
+                   f"{module_name} is patched, when it shouldn't be"
 
     def test_instana_monkey_options_only_socket(self):
         os.environ['INSTANA_GEVENT_MONKEY_OPTIONS'] = (
                 '--socket, --no-time, --no-select, --no-os, --no-queue, --no-threading,'
                 '--no-os, --no-ssl, no-subprocess, --no-signal, --no-select,')
         apply_gevent_monkey_patch()
-
-        self.assertTrue(monkey.is_module_patched('socket'), "socket module is not patched")
+        
+        assert monkey.is_module_patched('socket'), "socket module is not patched"
         not_patched_modules = (m for m in self.default_patched_modules if m not in ('socket', 'threading'))
-
+        
         for module_name in not_patched_modules:
-            self.assertFalse(monkey.is_module_patched(module_name),
-                             f"{module_name} is patched, when it shouldn't be")
+            assert not monkey.is_module_patched(module_name), \
+                   f"{module_name} is patched, when it shouldn't be"