Skip to content
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

[uss_qualifier] Fix NetRID automated testing issues #305

Merged
merged 1 commit into from
Nov 1, 2023
Merged

[uss_qualifier] Fix NetRID automated testing issues #305

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/isa_simple.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ def _search_huge_area_step():
) as check:
_ = self._dss_wrapper.search_isas_expect_response_code(
check,
expected_error_codes={413},
expected_error_codes={400, 413},
area=self._huge_area,
)

Expand Down
2 changes: 1 addition & 1 deletion monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/subscription_simple.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ def _test_huge_area_search_sub(self):
) as check:
self._dss_wrapper.search_subs_expect_response_code(
check=check,
expected_codes={413},
expected_codes={400, 413},
area=self._problematically_big_area,
)

Expand Down
2 changes: 1 addition & 1 deletion monitoring/uss_qualifier/scenarios/astm/netrid/display_data_evaluator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ def _evaluate_area_too_large_observation(
with self._test_scenario.check(
"Area too large", [observer.participant_id]
) as check:
if query.status_code != 413:
if query.status_code not in (400, 413):
check.record_failed(
summary="Did not receive expected error code for too-large area request",
details=f"{observer.participant_id} was queried for flights in {_rect_str(rect)} with a diagonal of {diagonal} which is larger than the maximum allowed diagonal of {self._rid_version.max_diagonal_km}. The expected error code is 413, but instead code {query.status_code} was received.",
Expand Down
4 changes: 2 additions & 2 deletions monitoring/uss_qualifier/test_data/che/rid/foca.kml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@
<description>serial_number: 36ZN8ZAJFH6N3
operation_description: Bend west
operator_id: OP-000002che
registration_number: CHE2h6zwko1y0xr6
registration_number: HB.2h6zwko1y0xr6
aircraft_type: HybridLift
operator_name: Participant 2
timestamp_accuracy: 1.0
Expand Down Expand Up @@ -417,7 +417,7 @@ accuracy_v: VAUnknown</description>
<description>serial_number: VF0M3GRU
operation_description: Bend west
operator_id: OP-000001che
registration_number: CHE5jwwg00t0vfhc
registration_number: HB.5jwwg00t0vfhc
aircraft_type: HybridLift
operator_name: Participant 1
timestamp_accuracy: 1.0
Expand Down
4 changes: 2 additions & 2 deletions monitoring/uss_qualifier/test_data/usa/kentland/rid.kml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@
<description>serial_number: EXPL3123
operation_description: U-turn south of takeoff
operator_id: EXAMPLE_OPERATOR2
registration_number: EXAMPLE_REGISTRATION2
registration_number: N.123456
aircraft_type: HybridLift
operator_name: UFT Participant 2
timestamp_accuracy: 1.0
Expand Down Expand Up @@ -434,7 +434,7 @@ accuracy_v: VAUnknown</description>
<description>serial_number: EXAMPLE_SERIAL1
operation_description: Circle around dairy complex
operator_id: EXAMPLE_OPERATOR1
registration_number: EXAMPLE_REGISTRATION1
registration_number: N.123456
aircraft_type: Helicopter
operator_name: UFT Participant 1
timestamp_accuracy: 1.0
Expand Down
2 changes: 1 addition & 1 deletion monitoring/uss_qualifier/test_data/usa/netrid/dcdemo.kml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
<description>serial_number: EXMPLx31bclx2guk
operation_description: Traffic Monitoring
operator_id: OP-d7p4o3l2
registration_number: FA-atqbGtF5FFc
registration_number: N.123456
aircraft_type: Helicopter
operator_name: Johnson Group
timestamp_accuracy: 1.0
Expand Down
Loading