Skip to content

Feature/update ckan and ojp tests #30

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
eveline-walker-sbb wants to merge 3 commits into
base: master
Choose a base branch
from
+29 −47
Open

Feature/update ckan and ojp tests #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f385d7
add config.json to ckan health test
eveline-walker-sbb Jun 22, 2026
f9767ae
add error text to response
eveline-walker-sbb Jun 22, 2026
d5d49b9
adapt range for tests 1 and 3
eveline-walker-sbb Jun 22, 2026
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
61 changes: 17 additions & 44 deletions tests/ckan_health_tests/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,20 @@


NOW = dt.now(timezone.utc)

DS_PATH = "tests/ckan_health_tests/data/datasets.json"

TEST_NAME = "ckan_health_tests"
CONFIG_FILE = f"tests/{TEST_NAME}/data/config.json"
config = load_json_file(CONFIG_FILE)
if not config:
raise FileNotFoundError(f"Config file not found at {CONFIG_FILE}")

DS_PATH = f"tests/{TEST_NAME}/data/datasets.json"
EXCLUDED_DATASETS = config["excluded_datasets"]
EXCLUDED_PERMALINK_AGE_CHECK = config["excluded_permalink_age_check"]
DATASETS_WITH_RESSOURCES_OF_UNLIMITED_AGE = config["datasets_with_resources_of_unlimited_age"]
LESS_THAN_DAILY_UPDATES_UTC = config["less_than_daily_updates_utc"]
MINIMUM_ACCEPTABLE_AGE = config["minimum_acceptable_age"]
DEFAULT_ACCEPTABLE_AGE = config["default_acceptable_age"]
EXCLUDED_NON_DAILY_CRONS = config["excluded_non_daily_crons"]

def get_datasets(data_test: DataTest) -> dict:
"""Gets a dict with dataset id (slug)/identifier as key/value pairs; if not in available at DS_PATH, load and save it.
Expand All @@ -41,9 +52,6 @@ def get_datasets(data_test: DataTest) -> dict:
data_test.log_exception(f"get_datasets failed with {str(e)}", e)
return {}


EXCLUDED_NON_DAILY_CRONS = ('gtfs2020-harvester', )

def check_harvesters(harvesters: list, data_test: DataTest) -> dict:
harvester_to_datasets_mapping = {}
count_hanging, count_too_old = 0, 0
Expand Down Expand Up @@ -81,40 +89,6 @@ def check_harvesters(harvesters: list, data_test: DataTest) -> dict:

return harvester_to_datasets_mapping


EXCLUDED_DATASETS = ('business-organisations', 'formations', 'gtfsrt', 'gtfs-sa', 'halte', 'hrdf_test_207',
'lod-pilot', 'netex-fernbus', 'ojp2-0', 'ojp2020', 'ojpfare', 'osdm-offline', 'rds-tmc',
'siri-et', 'siri-pt', 'siri-sx', 'trafficcountersrealtime', 'trafficlights-road-dynamic',
'trafficsituations', 'vm-liste')
EXCLUDED_PERMALINK_AGE_CHECK = ("business-organisation-v2", "contact-point-v2", "line-v2", "parking-lot-v2",
"platform-v2", "reference-point-v2", "relation-v2", "sectors-and-sector-groups-v2",
"service-point-v2", "stop-point-v2", "subline-v2", "timetable-field-number-v2",
"toilet-v2", "traffic-point-v2")
DATASETS_WITH_RESSOURCES_OF_UNLIMITED_AGE = (
'timetable-2027-gtfs2020', 'timetablenetex_2027', # temporarily set, until mid juin 2026
'atzgf', 'einundaus', 'ereignisinformationen', 'ga-hta-liste1', 'go-realtime', 'go-siri-sx', 'go-siri-sx-infra',
'ladestationen', 'sharedmobility', 'timetable-draft-gtfs', 'verbundsabos', 'vnch-swisstne', 'zugzahlen',
'netex-fernbus', 'timetable-2024-gtfs2020', 'timetable-2025-gtfs2020', 'list-sjyid',
'timetable-54-2024-hrdf-autoverlad', 'timetable-54-2025-hrdf-autoverlad',
'list-sjyid-2025', 'list-sjyid-2025-v2',
'timetable-54-2024-hrdf', 'timetable-54-2025-hrdf', 'timetable-54-draft-hrdf',
'timetablenetex_2024', 'timetablenetex_2025', 'trafficcounters', 'trafficlights-road-static')
LESS_THAN_DAILY_UPDATES_UTC = {
'gtfsflex': 'MON09,THU09',
'timetable-2026-gtfs2020': 'THU08,MON08',
'list-sjyid-2026': 'TUE22,FRI22',
'list-sjyid-2026-v2': 'TUE22,FRI22',
'timetable-54-2026-hrdf-autoverlad': 'TUE21,FRI21',
'timetable-54-2026-hrdf': 'TUE21,FRI21',
'timetable-54-2027-hrdf-autoverlad': 'TUE21,FRI21',
'timetable-54-2027-hrdf': 'TUE21,FRI21',
'hrdf_odv': 'TUE08,FRI08',
'netex_tt_odv': 'MON10,THU10',
'timetablenetex_2026': 'TUE01,FRI01'
}
MINIMUM_ACCEPTABLE_AGE = 0.25
DEFAULT_ACCEPTABLE_AGE = 1.1

def _get_past_instant(target_weekday_str, target_hour):
WD = {"mon": 0, "tue": 1, "wed": 2, "thu": 3, "fri": 4, "sat": 5, "sun": 6}
target_weekday = WD.get(target_weekday_str.lower()[0:3])
Expand Down Expand Up @@ -191,8 +165,8 @@ def check_datasets_permalink_and_age(datasets: dict, harvester_to_datasets_mappi
data_test.log_info(f"CKAN dataset tests: Checked {len(datasets)}, {count_permalink_fails} permalink errors, {count_age_fails} exceeding acceptable age.")


def run(config: dict = None):
data_test = DataTest(name="ckan_health_tests")
def run():
data_test = DataTest(name=TEST_NAME)
packages, data_test = load_ckan_package_list(data_test)

harvesters = [h for h in packages if 'harvester' in h]
Expand All @@ -205,6 +179,5 @@ def run(config: dict = None):


if __name__ == '__main__':
from configuration import CONFIG
tr = run(config=CONFIG)
tr = run()
print(tr)
15 changes: 12 additions & 3 deletions tests/ojp_fare_tests/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
FARE_OPTIONS = {
"test1": {
"params": ["Adult", "second", 20, None, None],
"min_price": 30.00,
"min_price": 20.00,
"max_price": 60.00
},
"test2": {
Expand All @@ -36,7 +36,7 @@
},
"test3": {
"params":["Adult", "second", 20, "HTA", "Halbtax-Abonnement"],
"min_price": 30.00,
"min_price": 20.00,
"max_price": 60.00
},
"test4": {
Expand Down Expand Up @@ -159,7 +159,16 @@ def run():
except ValueError:
data_test.log_failure(f"{test_id} could not parse price '{actual_price_str}' as a number. {response_fare.text}")
else:
data_test.log_failure(f"{test_id} No price found for {travel_class} class. {response_fare.text}")
error_text = "Unknown Error"

error_element = fare_root.find(".//ns2:ErrorText", NS)
if error_element is None:
error_element = fare_root.find(".//ojp:ErrorText", NS) or fare_root.find(".//ErrorText", NS)

if error_element is not None and error_element.text:
error_text = error_element.text

data_test.log_failure(f"{test_id} No price found for {travel_class} class. API Error: {error_text}")
_dump_to_file(fare_xml_body + "\n\n" + response_fare.text, case=f"{test_id}_NO_PRICE_FOUND")
else:
data_test.log_failure(f"No Trip element found {trip_string}")
Expand Down