Skip to content

Commit 7ae6362

Browse files
committed
fix(cre-main): rename misspelled variable pending_stadards to pending_standards
1 parent 4f4390c commit 7ae6362

3 files changed

Lines changed: 27 additions & 7 deletions

File tree

application/cmd/cre_main.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -277,8 +277,8 @@ def register_standard(
277277
# calculate gap analysis
278278
populate_neo4j_db(db_connection_str)
279279
jobs = []
280-
pending_stadards = collection.standards()
281-
for standard_name in pending_stadards:
280+
pending_standards = collection.standards()
281+
for standard_name in pending_standards:
282282
if standard_name == importing_name:
283283
continue
284284

@@ -293,9 +293,9 @@ def register_standard(
293293
jobs.append(forward_job)
294294
except exceptions.NoSuchJobError as nje:
295295
logger.error(
296-
f"Could not find gap analysis job for for {importing_name} and {standard_name} putting {standard_name} back in the queue"
296+
f"Could not find gap analysis job for {importing_name} and {standard_name} putting {standard_name} back in the queue"
297297
)
298-
pending_stadards.append(standard_name)
298+
pending_standards.append(standard_name)
299299

300300
bw_key = gap_analysis.make_resources_key([standard_name, importing_name])
301301
if not collection.gap_analysis_exists(bw_key):
@@ -308,9 +308,9 @@ def register_standard(
308308
jobs.append(backward_job)
309309
except exceptions.NoSuchJobError as nje:
310310
logger.error(
311-
f"Could not find gap analysis job for for {importing_name} and {standard_name} putting {standard_name} back in the queue"
311+
f"Could not find gap analysis job for {importing_name} and {standard_name} putting {standard_name} back in the queue"
312312
)
313-
pending_stadards.append(standard_name)
313+
pending_standards.append(standard_name)
314314
redis.wait_for_jobs(jobs)
315315
conn.set(standard_hash, value="")
316316

application/database/db.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -995,7 +995,7 @@ def get_by_tags(self, tags: List[str]) -> List[cre_defs.Document]:
995995
documents.extend(resolved)
996996
else:
997997
logger.fatal(
998-
"db.get_node returned None for "
998+
"get_nodes() returned no documents for "
999999
"Node %s:%s:%s that exists, BUG!"
10001000
% (db_node.name, db_node.section, db_node.section_id)
10011001
)

application/tests/db_test.py

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,26 @@ def test_get_by_tags(self) -> None:
125125
self.assertEqual(self.collection.get_by_tags([]), [])
126126
self.assertEqual(self.collection.get_by_tags(["this should not be a tag"]), [])
127127

128+
@patch("application.database.db.logger")
129+
def test_get_by_tags_empty_nodes_regression(self, mock_logger) -> None:
130+
"""
131+
Simulate get_nodes returning an empty list to test the error path in get_by_tags.
132+
See PR #837 regression fix.
133+
"""
134+
dbstandard = db.Node(
135+
section="regression_section",
136+
name="regression_name",
137+
tags="regression_tag",
138+
ntype=defs.Standard.__name__,
139+
)
140+
self.collection.session.add(dbstandard)
141+
self.collection.session.commit()
142+
143+
with patch.object(self.collection, "get_nodes", return_value=[]):
144+
res = self.collection.get_by_tags(["regression_tag"])
145+
self.assertEqual(res, [])
146+
mock_logger.fatal.assert_called_once()
147+
128148
def test_get_standards_names(self) -> None:
129149
result = self.collection.get_node_names()
130150
expected = [("Standard", "BarStand"), ("Standard", "Unlinked")]

0 commit comments

Comments
 (0)