Updated tests to match the formatting work done in the admin repo

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>

tests/notifications_utils/clients/antivirus/test_antivirus_client.py

@@ -9,7 +9,7 @@ from notifications_utils.clients.antivirus.antivirus_client import (
 )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def antivirus(app, mocker):
     client = AntivirusClient()
     app.config["ANTIVIRUS_API_HOST"] = "https://antivirus"
@@ -39,25 +39,33 @@ def test_scan_document(antivirus, rmock):
 
 def test_should_raise_for_status(antivirus, rmock):
     with pytest.raises(AntivirusError) as excinfo:
-        rmock.request(
-            "POST",
-            "https://antivirus/scan",
-            json={"error": "Antivirus error"},
-            status_code=400,
-        )
-
-        antivirus.scan(io.BytesIO(b"document"))
+        _test_one_statement_for_status(antivirus, rmock)
 
     assert excinfo.value.message == "Antivirus error"
     assert excinfo.value.status_code == 400
 
 
+def _test_one_statement_for_status(antivirus, rmock):
+    rmock.request(
+        "POST",
+        "https://antivirus/scan",
+        json={"error": "Antivirus error"},
+        status_code=400,
+    )
+
+    antivirus.scan(io.BytesIO(b"document"))
+
+
 def test_should_raise_for_connection_errors(antivirus, rmock):
     with pytest.raises(AntivirusError) as excinfo:
-        rmock.request(
-            "POST", "https://antivirus/scan", exc=requests.exceptions.ConnectTimeout
-        )
-        antivirus.scan(io.BytesIO(b"document"))
+        _test_one_statement_for_connection_errors(antivirus, rmock)
 
     assert excinfo.value.message == "connection error"
     assert excinfo.value.status_code == 503
+
+
+def _test_one_statement_for_connection_errors(antivirus, rmock):
+    rmock.request(
+        "POST", "https://antivirus/scan", exc=requests.exceptions.ConnectTimeout
+    )
+    antivirus.scan(io.BytesIO(b"document"))