Skip to content

Commit

Permalink
Merge pull request #54 from MITLibraries/fix-tests-from-merges
Browse files Browse the repository at this point in the history
Re-add CI yaml for Github actions and fix broken tests
  • Loading branch information
ghukill committed Dec 21, 2023
2 parents 3a54190 + 1d7a3aa commit 4801673
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 11 deletions.
7 changes: 7 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
name: CI
on: push
jobs:
test:
uses: mitlibraries/.github/.github/workflows/python-shared-test.yml@main
lint:
uses: mitlibraries/.github/.github/workflows/python-shared-lint.yml@main
2 changes: 2 additions & 0 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import boto3
import pytest
from click.testing import CliRunner
from freezegun import freeze_time
from moto import mock_s3

from harvester.aws.sqs import SQSClient, ZipFileEventMessage
Expand Down Expand Up @@ -373,6 +374,7 @@ def strings_from_xpath_unhandled_value():


@pytest.fixture
@freeze_time("2024-01-01")
def records_for_writing(fgdc_source_record_from_zip):
record = Record(
identifier="SDE_DATA_AE_A8GNS_2003",
Expand Down
10 changes: 6 additions & 4 deletions tests/test_harvest/test_harvester.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import pytest
from dateutil.parser import ParserError
from dateutil.tz import tzutc
from freezegun import freeze_time

from harvester.records import FGDC, MITAardvark, Record
from harvester.records.exceptions import FieldMethodError
Expand All @@ -26,11 +27,11 @@ def test_harvester_from_until_date_parsing_success(generic_harvester_class):
from_date=from_date,
until_date=until_date,
)
assert harvester.from_datetime_object == datetime.datetime(
2000, 1, 1, 5, 0, tzinfo=tzutc()
assert harvester.from_datetime_object == datetime.datetime(2000, 1, 1).astimezone(
tzutc()
)
assert harvester.until_datetime_object == datetime.datetime(
2050, 12, 31, 5, 0, tzinfo=tzutc()
assert harvester.until_datetime_object == datetime.datetime(2050, 12, 31).astimezone(
tzutc()
)


Expand Down Expand Up @@ -242,6 +243,7 @@ def test_harvester_write_source_metadata_success(
file_obj.write.assert_called_once_with(record.source_record.data)


@freeze_time("2024-01-01")
def test_harvester_write_normalized_metadata_success(
generic_harvester_class, records_for_writing
):
Expand Down
17 changes: 10 additions & 7 deletions tests/test_records/test_record.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,19 +103,22 @@ def test_source_record_normalize_field_method_fails_raise_error(


def test_mitaardvark_to_dict_success(
valid_required_mitaardvark_record, valid_required_mitaardvark_data
valid_mitaardvark_record_required_fields, valid_mitaardvark_data_required_fields
):
assert valid_required_mitaardvark_record.to_dict() == valid_required_mitaardvark_data
assert (
valid_mitaardvark_record_required_fields.to_dict()
== valid_mitaardvark_data_required_fields
)


def test_mitaardvark_to_json_success(
valid_required_mitaardvark_record, valid_required_mitaardvark_data
valid_mitaardvark_record_required_fields, valid_mitaardvark_data_required_fields
):
assert valid_required_mitaardvark_record.to_json() == json.dumps(
valid_required_mitaardvark_data, indent=2
assert valid_mitaardvark_record_required_fields.to_json() == json.dumps(
valid_mitaardvark_data_required_fields, indent=2
)
assert valid_required_mitaardvark_record.to_json(pretty=False) == json.dumps(
valid_required_mitaardvark_data
assert valid_mitaardvark_record_required_fields.to_json(pretty=False) == json.dumps(
valid_mitaardvark_data_required_fields
)


Expand Down

0 comments on commit 4801673

Please sign in to comment.