diff options
| -rw-r--r-- | gn3/db/case_attributes.py | 6 | ||||
| -rw-r--r-- | tests/unit/db/test_sample_data.py | 27 |
2 files changed, 3 insertions, 30 deletions
diff --git a/gn3/db/case_attributes.py b/gn3/db/case_attributes.py index 8eb2bf6..98fc58d 100644 --- a/gn3/db/case_attributes.py +++ b/gn3/db/case_attributes.py @@ -33,13 +33,13 @@ def insert_case_attribute_audit( "INSERT INTO caseattributes_audit " "(status, editor, json_diff_data) " "VALUES (%s, %s, %s)", - (status, author, data), + (status, author, data,), ) rowcount = cursor.rowcount - conn.commit() except Exception as _e: conn.rollback() raise MySQLdb.Error(_e) from _e + conn.commit() return rowcount @@ -55,7 +55,7 @@ def reject_case_attribute(conn: Any, case_attr_audit_id: int) -> int: (case_attr_audit_id,), ) rowcount = cursor.rowcount - conn.commit() + conn.commit() except Exception as _e: conn.rollback() raise MySQLdb.Error(_e) from _e diff --git a/tests/unit/db/test_sample_data.py b/tests/unit/db/test_sample_data.py index 8af4d3b..4c64da4 100644 --- a/tests/unit/db/test_sample_data.py +++ b/tests/unit/db/test_sample_data.py @@ -4,10 +4,8 @@ import gn3 from gn3.db.sample_data import __extract_actions from gn3.db.sample_data import delete_sample_data -from gn3.db.sample_data import get_case_attributes from gn3.db.sample_data import insert_sample_data from gn3.db.sample_data import update_sample_data -from gn3.db.sample_data import get_trait_csv_sample_data @pytest.mark.unit_test @@ -221,28 +219,3 @@ def test_update_sample_data(mocker): ], any_order=False, ) - - -@pytest.mark.unit_test -def test_get_case_attributes(mocker): - """Test that case attributes work well""" - mock_conn = mocker.MagicMock() - with mock_conn.cursor() as cursor: - cursor.fetchall.return_value = ( - (1, "Condition", None), - (2, "Tissue", None), - (3, "Age", "Cum sociis natoque penatibus et magnis dis"), - (4, "Condition", "Description A"), - (5, "Condition", "Description B"), - ) - results = get_case_attributes(mock_conn) - cursor.execute.assert_called_once_with( - "SELECT Id, Name, Description FROM CaseAttribute" - ) - assert results == ( - (1, "Condition", None), - (2, "Tissue", None), - (3, "Age", "Cum sociis natoque penatibus et magnis dis"), - (4, "Condition", "Description A"), - (5, "Condition", "Description B"), - ) |