pop env vars for fwpc and tptc

Author: Victoria Hall

.github/Scripts/deferred-bindings-tests.sh

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+python -m pytest -q -n auto --dist loadfile --reruns 4 --instafail --cov=./azure_functions_worker --cov-report xml --cov-branch --cov-append tests/extension_tests/deferred_bindings_tests

.github/workflows/ci_e2e_workflow.yml

@@ -78,6 +78,7 @@ jobs:
         run: |
           chmod +x .github/Scripts/fwpc-tests.sh 
           chmod +x .github/Scripts/e2e-tests.sh
+          chmod +x .github/Scripts/deferred-bindings-tests.sh
       - name: Running 3.7 Tests
         if: matrix.python-version == 3.7
         env:
@@ -92,6 +93,7 @@ jobs:
         run: |
           .github/Scripts/fwpc-tests.sh
           .github/Scripts/e2e-tests.sh
+          .github/Scripts/deferred-bindings-tests.sh
       - name: Running 3.8 Tests
         if: matrix.python-version == 3.8
         env:
@@ -106,6 +108,7 @@ jobs:
         run: |
           .github/Scripts/fwpc-tests.sh
           .github/Scripts/e2e-tests.sh
+          .github/Scripts/deferred-bindings-tests.sh
       - name: Running 3.9 Tests
         if: matrix.python-version == 3.9
         env:
@@ -120,6 +123,7 @@ jobs:
         run: |
           .github/Scripts/fwpc-tests.sh
           .github/Scripts/e2e-tests.sh
+          .github/Scripts/deferred-bindings-tests.sh
       - name: Running 3.10 Tests
         if: matrix.python-version == 3.10
         env:
@@ -134,6 +138,7 @@ jobs:
         run: |
           .github/Scripts/fwpc-tests.sh
           .github/Scripts/e2e-tests.sh
+          .github/Scripts/deferred-bindings-tests.sh
       - name: Running 3.11 Tests
         if: matrix.python-version == 3.11
         env:
@@ -148,6 +153,7 @@ jobs:
         run: |
           .github/Scripts/fwpc-tests.sh
           .github/Scripts/e2e-tests.sh
+          .github/Scripts/deferred-bindings-tests.sh
       - name: Codecov
         uses: codecov/codecov-action@v3
         with:

tests/endtoend/test_threadpool_thread_count_functions.py

@@ -2,7 +2,6 @@
 # Licensed under the MIT License.
 import os
 from threading import Thread
-from unittest.mock import patch
 from datetime import datetime
 from tests.utils import testutils
 
@@ -16,18 +15,13 @@ class TestPythonThreadpoolThreadCount(testutils.WebHostTestCase):
 
     @classmethod
     def setUpClass(cls):
-        cls.env_variables['PYTHON_THREADPOOL_THREAD_COUNT'] = '2'
+        os.environ["PYTHON_THREADPOOL_THREAD_COUNT"] = "2"
 
-        os_environ = os.environ.copy()
-        os_environ.update(cls.env_variables)
-
-        cls._patch_environ = patch.dict('os.environ', os_environ)
-        cls._patch_environ.start()
         super().setUpClass()
 
     def tearDown(self):
+        os.environ.pop('PYTHON_THREADPOOL_THREAD_COUNT')
         super().tearDown()
-        self._patch_environ.stop()
 
     @classmethod
     def get_script_dir(cls):

tests/endtoend/test_worker_process_count_functions.py

@@ -2,7 +2,6 @@
 # Licensed under the MIT License.
 import os
 from threading import Thread
-from unittest.mock import patch
 from datetime import datetime
 from tests.utils import testutils
 
@@ -15,19 +14,15 @@ class TestWorkerProcessCount(testutils.WebHostTestCase):
     """
     @classmethod
     def setUpClass(cls):
-        cls.env_variables['PYTHON_THREADPOOL_THREAD_COUNT'] = '1'
-        cls.env_variables['FUNCTIONS_WORKER_PROCESS_COUNT'] = '2'
+        os.environ["PYTHON_THREADPOOL_THREAD_COUNT"] = "1"
+        os.environ["FUNCTIONS_WORKER_PROCESS_COUNT"] = "2"
 
-        os_environ = os.environ.copy()
-        os_environ.update(cls.env_variables)
-
-        cls._patch_environ = patch.dict('os.environ', os_environ)
-        cls._patch_environ.start()
         super().setUpClass()
 
     def tearDown(self):
+        os.environ.pop('PYTHON_THREADPOOL_THREAD_COUNT')
+        os.environ.pop('FUNCTIONS_WORKER_PROCESS_COUNT')
         super().tearDown()
-        self._patch_environ.stop()
 
     @classmethod
     def get_script_dir(cls):

tests/unittests/test_enable_debug_logging_functions.py

@@ -2,7 +2,6 @@
 # Licensed under the MIT License.
 import typing
 import os
-from unittest.mock import patch
 
 from tests.utils import testutils
 from azure_functions_worker.constants import PYTHON_ENABLE_DEBUG_LOGGING