small test fixes

give up on coverage support for things that are tested in different
processes, or in gthread, because it looks like pytest-cov gave up on
support for these, where as coverage has out-of-the-box support

Author: jrmfg

src/functions_framework/_http/gunicorn.py

@@ -40,15 +40,16 @@ def __init__(self, app, host, port, debug, **options):
             "limit_request_line": 0,
         }
 
-        if TIMEOUT_SECONDS > 0:
-            if threads > 1 and _is_truthy(
-                os.environ.get("THREADED_TIMEOUT_ENABLED", "False")
-            ):
-                self.options["worker_class"] = (
-                    "functions_framework._http.gunicorn.GThreadWorkerWithTimeoutSupport"
-                )
-            else:
-                self.options["timeout"] = TIMEOUT_SECONDS
+        if (
+            TIMEOUT_SECONDS > 0
+            and threads > 1
+            and _is_truthy(os.environ.get("THREADED_TIMEOUT_ENABLED", "False"))
+        ):  # pragma: no cover
+            self.options["worker_class"] = (
+                "functions_framework._http.gunicorn.GThreadWorkerWithTimeoutSupport"
+            )
+        else:
+            self.options["timeout"] = TIMEOUT_SECONDS
 
         self.options.update(options)
         self.app = app
@@ -63,11 +64,11 @@ def load(self):
         return self.app
 
 
-class GThreadWorkerWithTimeoutSupport(ThreadWorker):
+class GThreadWorkerWithTimeoutSupport(ThreadWorker):  # pragma: no cover
     def handle_request(self, req, conn):
-        with ThreadingTimeout(TIMEOUT_SECONDS, swallow_exc=False):
+        with ThreadingTimeout(TIMEOUT_SECONDS):
             super(GThreadWorkerWithTimeoutSupport, self).handle_request(req, conn)
 
 
-def _is_truthy(s):
+def _is_truthy(s):  # pragma: no cover
     return str(s).lower() in ("yes", "y", "1", "yeah", "true", "t")

src/functions_framework/request_timeout.py

@@ -8,10 +8,9 @@
 logger = logging.getLogger(__name__)
 
 
-class ThreadingTimeout(object):
-    def __init__(self, seconds, swallow_exc=True):
+class ThreadingTimeout(object):  # pragma: no cover
+    def __init__(self, seconds):
         self.seconds = seconds
-        self.swallow_exc = swallow_exc
         self.target_tid = threading.current_thread().ident
         self.timer = None
 

tests/test_timeouts.py

@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import os
 import pathlib
 import pytest
 import requests
@@ -30,10 +29,14 @@
 
 @pytest.fixture(autouse=True)
 def run_around_tests():
+    # the test samples test also listens on 8080, so let's be good stewards of
+    # the port and make sure it's free
     _wait_for_no_listen(TEST_HOST, TEST_PORT)
     yield
+    _wait_for_no_listen(TEST_HOST, TEST_PORT)
 
 
+@pytest.mark.slow_integration_test
 def test_no_timeout_allows_request_processing_to_finish():
     source = TEST_FUNCTIONS_DIR / "timeout" / "main.py"
     target = "function"
@@ -53,12 +56,13 @@ def test_no_timeout_allows_request_processing_to_finish():
 
     result = requests.get("http://{}:{}/".format(TEST_HOST, TEST_PORT))
 
-    gunicorn_p.kill()
+    gunicorn_p.terminate()
     gunicorn_p.join()
 
     assert result.status_code == 200
 
 
+@pytest.mark.slow_integration_test
 def test_timeout_but_not_threaded_timeout_enabled_does_not_kill(monkeypatch):
     monkeypatch.setenv("CLOUD_RUN_TIMEOUT_SECONDS", "1")
     monkeypatch.setenv("THREADED_TIMEOUT_ENABLED", "false")
@@ -73,23 +77,20 @@ def test_timeout_but_not_threaded_timeout_enabled_does_not_kill(monkeypatch):
         app, TEST_HOST, TEST_PORT, False, **options
     )
 
-    os.environ.clear()
-    os.environ["CLOUD_RUN_TIMEOUT_SECONDS"] = "1"
-    os.environ["THREADED_TIMEOUT_ENABLED"] = "false"
-
     gunicorn_p = Process(target=gunicorn_app.run)
     gunicorn_p.start()
 
     _wait_for_listen(TEST_HOST, TEST_PORT)
 
     result = requests.get("http://{}:{}/".format(TEST_HOST, TEST_PORT))
 
-    gunicorn_p.kill()
+    gunicorn_p.terminate()
     gunicorn_p.join()
 
     assert result.status_code == 200
 
 
+@pytest.mark.slow_integration_test
 def test_timeout_and_threaded_timeout_enabled_kills(monkeypatch):
     monkeypatch.setenv("CLOUD_RUN_TIMEOUT_SECONDS", "1")
     monkeypatch.setenv("THREADED_TIMEOUT_ENABLED", "true")
@@ -111,7 +112,7 @@ def test_timeout_and_threaded_timeout_enabled_kills(monkeypatch):
 
     result = requests.get("http://{}:{}/".format(TEST_HOST, TEST_PORT))
 
-    gunicorn_p.kill()
+    gunicorn_p.terminate()
     gunicorn_p.join()
 
     # Any exception raised in execution is a 500 error. Cloud Functions 1st gen and
@@ -121,6 +122,7 @@ def test_timeout_and_threaded_timeout_enabled_kills(monkeypatch):
     assert result.status_code == 500
 
 
+@pytest.mark.slow_integration_test
 def test_timeout_and_threaded_timeout_enabled_but_timeout_not_exceeded_doesnt_kill(
     monkeypatch,
 ):
@@ -144,7 +146,7 @@ def test_timeout_and_threaded_timeout_enabled_but_timeout_not_exceeded_doesnt_ki
 
     result = requests.get("http://{}:{}/".format(TEST_HOST, TEST_PORT))
 
-    gunicorn_p.kill()
+    gunicorn_p.terminate()
     gunicorn_p.join()
 
     assert result.status_code == 200