Skip to content

Fix flaky gap-analysis tests connecting to real Redis instead of mock #1010

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DevPatils wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −13
Open

Fix flaky gap-analysis tests connecting to real Redis instead of mock #1010

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions application/tests/web_main_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
from types import SimpleNamespace
from unittest.mock import patch, Mock

import redis
import rq
import os
import networkx as nx
Expand All @@ -20,6 +19,7 @@
from application.database import db
from application.cmd import cre_main
from application.utils import spreadsheet
from application.utils import redis as app_redis
from application.defs import cre_defs as defs
from application.web import web_main
from application.utils.gap_analysis import GAP_ANALYSIS_TIMEOUT
Expand Down Expand Up @@ -741,7 +741,7 @@ def test_smartlink_rejected_redirects(self, mock_redirect) -> None:
self.assertEqual(404, response.status_code)
mock_redirect.assert_called_once_with("CWE", "999")

@patch.object(redis, "from_url")
@patch.object(app_redis, "connect")
@patch.object(db, "Node_collection")
def test_gap_analysis_from_cache_full_response(
self, db_mock, redis_conn_mock
Expand All @@ -762,7 +762,7 @@ def test_gap_analysis_from_cache_full_response(
@patch.object(db, "Node_collection")
@patch.object(rq.job.Job, "fetch")
@patch.object(rq.Queue, "enqueue_call")
@patch.object(redis, "from_url")
@patch.object(app_redis, "connect")
def test_gap_analysis_from_cache_job_id(
self, redis_conn_mock, enqueue_call_mock, fetch_mock, db_mock
) -> None:
Expand All @@ -784,7 +784,7 @@ def test_gap_analysis_from_cache_job_id(
@patch.object(db, "Node_collection")
@patch.object(rq.job.Job, "fetch")
@patch.object(rq.Queue, "enqueue_call")
@patch.object(redis, "from_url")
@patch.object(app_redis, "connect")
def test_gap_analysis_returns_existing_inflight_job(
self, redis_conn_mock, enqueue_call_mock, fetch_mock, db_mock
) -> None:
Expand All @@ -804,7 +804,7 @@ def test_gap_analysis_returns_existing_inflight_job(

@patch.object(db, "Node_collection")
@patch.object(rq.Queue, "enqueue_call")
@patch.object(redis, "from_url")
@patch.object(app_redis, "connect")
def test_gap_analysis_create_job_id(
self, redis_conn_mock, enqueue_call_mock, db_mock
) -> None:
Expand Down Expand Up @@ -832,7 +832,7 @@ def test_gap_analysis_create_job_id(

@patch.object(db, "Node_collection")
@patch.object(rq.Queue, "enqueue_call")
@patch.object(redis, "from_url")
@patch.object(app_redis, "connect")
def test_map_analysis_non_material_sql_cache_triggers_job(
self, redis_conn_mock, enqueue_call_mock, db_mock
) -> None:
Expand All @@ -852,7 +852,7 @@ def test_map_analysis_non_material_sql_cache_triggers_job(

@patch.object(db, "Node_collection")
@patch.object(db, "gap_analysis")
@patch.object(redis, "from_url")
@patch.object(app_redis, "connect")
def test_gap_analysis_fallback_without_redis(
self, redis_conn_mock, db_gap_analysis_mock, db_mock
) -> None:
Expand All @@ -872,7 +872,7 @@ def test_gap_analysis_fallback_without_redis(

@patch.object(db, "Node_collection")
@patch.object(db, "gap_analysis")
@patch.object(redis, "from_url")
@patch.object(app_redis, "connect")
def test_gap_analysis_fallback_backend_failure_returns_503(
self, redis_conn_mock, db_gap_analysis_mock, db_mock
) -> None:
Expand All @@ -893,7 +893,7 @@ def test_gap_analysis_fallback_backend_failure_returns_503(

@patch.dict(os.environ, {"HEROKU": "True"}, clear=False)
@patch.object(db, "Node_collection")
@patch.object(redis, "from_url")
@patch.object(app_redis, "connect")
def test_gap_analysis_heroku_cache_miss_returns_404(
self, redis_conn_mock, db_mock
) -> None:
Expand All @@ -909,7 +909,7 @@ def test_gap_analysis_heroku_cache_miss_returns_404(

@patch.dict(os.environ, {"DYNO": "web.1"}, clear=False)
@patch.object(db, "Node_collection")
@patch.object(redis, "from_url")
@patch.object(app_redis, "connect")
def test_gap_analysis_dyno_cache_miss_returns_404(
self, redis_conn_mock, db_mock
) -> None:
Expand All @@ -925,7 +925,7 @@ def test_gap_analysis_dyno_cache_miss_returns_404(

@patch.dict(os.environ, {"HEROKU": "True"}, clear=False)
@patch.object(db, "Node_collection")
@patch.object(redis, "from_url")
@patch.object(app_redis, "connect")
def test_map_analysis_opencre_heroku_cache_miss_returns_404(
self, redis_conn_mock, db_mock
) -> None:
Expand All @@ -939,7 +939,7 @@ def test_map_analysis_opencre_heroku_cache_miss_returns_404(
db_mock.return_value.get_nodes.assert_not_called()
redis_conn_mock.assert_not_called()

@patch.object(redis, "from_url")
@patch.object(app_redis, "connect")
@patch.object(db, "Node_collection")
def test_standards_from_db(self, node_mock, redis_conn_mock) -> None:
expected = ["A", "B"]
Expand Down Expand Up @@ -1143,7 +1143,7 @@ def test_gap_analysis_returns_only_direct_opencre_mappings_when_opencre_is_left(
schedule_mock.assert_not_called()

@patch.object(cre_main, "resource_name_ga_eligible_in_db")
@patch.object(redis, "from_url")
@patch.object(app_redis, "connect")
@patch.object(db, "Node_collection")
def test_ga_standards_filters_non_eligible(
self, node_mock, redis_conn_mock, ga_eligible_mock
Expand Down
Loading