Adding more tests. Updating services

Author: Bryan Sieber

infra/config/local_dev.env

@@ -0,0 +1,8 @@
+# Environment variables for the local development environment
+
+# Jira API Secrets
+JIRA_USERNAME="fake_jira_username"
+JIRA_PASSWORD="fake_jira_password"
+
+# Bugzilla API Secrets
+BUGZILLA_API_KEY="fake_bugzilla_api_key"

src/jbi/services.py

@@ -5,23 +5,29 @@
 
 settings = environment.get_settings()
 
-jira = Jira(
-    url=settings.jira_base_url,
-    username=settings.jira_username,
-    password=settings.jira_password,
-)
 
-bugzilla = rh_bugzilla.Bugzilla(
-    settings.bugzilla_base_url, api_key=settings.bugzilla_api_key
-)
+def get_jira():
+    return Jira(
+        url=settings.jira_base_url,
+        username=settings.jira_username,
+        password=settings.jira_password,
+    )
+
+
+def get_bugzilla():
+    return rh_bugzilla.Bugzilla(
+        settings.bugzilla_base_url, api_key=settings.bugzilla_api_key
+    )
 
 
 def bugzilla_check_health():
+    bugzilla = get_bugzilla()
     health = {"up": bugzilla.logged_in}
     return health
 
 
 def jira_check_health():
+    jira = get_jira()
     server_info = jira.get_server_info(True)
     print(server_info)
     health = {"up": False}

tests/infra/docker-compose.test.yaml

@@ -12,3 +12,5 @@ services:
     # Let the init system handle signals for us.
     # among other things this helps shutdown be fast
     init: true
+    env_file:
+      - infra/config/local_dev.env

tests/unit/app/test_monitor.py

@@ -18,10 +18,52 @@ def test_read_version(anon_client):
 
 def test_read_heartbeat_no_services_fails(anon_client):
     """/__heartbeat__ returns 503 when the services are unavailable."""
-    resp = anon_client.get("/__heartbeat__")
+    expected = {
+        "jira": {
+            "up": False,
+        },
+        "bugzilla": {
+            "up": False,
+        },
+    }
+    with patch("src.app.monitor.jbi_service_health_map", return_value=expected):
+        resp = anon_client.get("/__heartbeat__")
+    assert resp.status_code == 503
+    data = resp.json()
+    assert data == expected
+
+
+def test_read_heartbeat_jira_services_fails(anon_client):
+    """/__heartbeat__ returns 503 when the services are unavailable."""
+    expected = {
+        "jira": {
+            "up": False,
+        },
+        "bugzilla": {
+            "up": True,
+        },
+    }
+    with patch("src.app.monitor.jbi_service_health_map", return_value=expected):
+        resp = anon_client.get("/__heartbeat__")
+    assert resp.status_code == 503
+    data = resp.json()
+    assert data == expected
+
+
+def test_read_heartbeat_bugzilla_services_fails(anon_client):
+    """/__heartbeat__ returns 503 when the services are unavailable."""
+    expected = {
+        "jira": {
+            "up": True,
+        },
+        "bugzilla": {
+            "up": False,
+        },
+    }
+    with patch("src.app.monitor.jbi_service_health_map", return_value=expected):
+        resp = anon_client.get("/__heartbeat__")
     assert resp.status_code == 503
     data = resp.json()
-    expected = {"bugzilla": {"up": False}, "jira": {"up": False}}
     assert data == expected