Skip to content

Commit 7cd4241

Browse files
committed
FIX: remove testing tolerances from parameters.
1 parent 917ecee commit 7cd4241

1 file changed

Lines changed: 16 additions & 10 deletions

File tree

tests/test_flight.py

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,7 @@ def test_hybrid_motor_flight(mock_show, calisto_hybrid_modded):
620620
assert test_flight.all_info() == None
621621

622622

623-
def test_surface_wind(flight_calisto_custom_wind, atol=1e-8):
623+
def test_surface_wind(flight_calisto_custom_wind):
624624
"""Tests the surface wind of the flight simulation. The expected values
625625
are provided by the definition of the 'light_calisto_custom_wind' fixture.
626626
If the fixture changes, this test must be updated.
@@ -634,13 +634,12 @@ def test_surface_wind(flight_calisto_custom_wind, atol=1e-8):
634634
Absolute tolerance error, by default 1e-8
635635
"""
636636
test = flight_calisto_custom_wind
637+
atol = 1e-8
637638
assert pytest.approx(2.0, abs=atol) == test.frontal_surface_wind
638639
assert pytest.approx(-5.0, abs=atol) == test.lateral_surface_wind
639640

640641

641-
def test_effective_rail_length(
642-
flight_calisto_robust, flight_calisto_nose_to_tail, atol=1e-8
643-
):
642+
def test_effective_rail_length(flight_calisto_robust, flight_calisto_nose_to_tail):
644643
"""Tests the effective rail length of the flight simulation. The expected
645644
values are calculated by hand, and should be valid as long as the rail
646645
length and the position of the buttons and nozzle do not change in the
@@ -662,6 +661,7 @@ def test_effective_rail_length(
662661
"""
663662
test1 = flight_calisto_robust
664663
test2 = flight_calisto_nose_to_tail
664+
atol = 1e-8
665665

666666
rail_length = 5.2
667667
upper_button_position = 0.082
@@ -679,7 +679,7 @@ def test_effective_rail_length(
679679
assert pytest.approx(test2.effective_2rl, abs=atol) == effective_2rl
680680

681681

682-
def test_max_values(flight_calisto_robust, atol=5e-3):
682+
def test_max_values(flight_calisto_robust):
683683
"""Test the max values of the flight. This tests if the max values are
684684
close to the expected values. However, the expected values were NOT
685685
calculated by hand, it was just copied from the test results. This is
@@ -701,13 +701,14 @@ def test_max_values(flight_calisto_robust, atol=5e-3):
701701
Absolute tolerance error, by default 5e-3
702702
"""
703703
test = flight_calisto_robust
704+
atol = 5e-3
704705
assert pytest.approx(105.2774, abs=atol) == test.max_acceleration_power_on
705706
assert pytest.approx(105.2774, abs=atol) == test.max_acceleration
706707
assert pytest.approx(0.85999, abs=atol) == test.max_mach_number
707708
assert pytest.approx(285.90240, abs=atol) == test.max_speed
708709

709710

710-
def test_rail_buttons_forces(flight_calisto_custom_wind, atol=5e-3):
711+
def test_rail_buttons_forces(flight_calisto_custom_wind):
711712
"""Test the rail buttons forces. This tests if the rail buttons forces are
712713
close to the expected values. However, the expected values were NOT
713714
calculated by hand, it was just copied from the test results. The results
@@ -723,13 +724,14 @@ def test_rail_buttons_forces(flight_calisto_custom_wind, atol=5e-3):
723724
The absolute tolerance error, by default 5e-3
724725
"""
725726
test = flight_calisto_custom_wind
727+
atol = 5e-3
726728
assert pytest.approx(3.80358, abs=atol) == test.max_rail_button1_normal_force
727729
assert pytest.approx(1.63602, abs=atol) == test.max_rail_button1_shear_force
728730
assert pytest.approx(1.19353, abs=atol) == test.max_rail_button2_normal_force
729731
assert pytest.approx(0.51337, abs=atol) == test.max_rail_button2_shear_force
730732

731733

732-
def test_accelerations(flight_calisto_custom_wind, atol=5e-3):
734+
def test_accelerations(flight_calisto_custom_wind):
733735
"""Tests if the acceleration in some particular points of the trajectory is
734736
correct. The expected values were NOT calculated by hand, it was just
735737
copied from the test results. The results are not expected to change,
@@ -743,6 +745,7 @@ def test_accelerations(flight_calisto_custom_wind, atol=5e-3):
743745
The absolute tolerance error, by default 5e-3
744746
"""
745747
test = flight_calisto_custom_wind
748+
atol = 5e-3
746749

747750
points = {
748751
"t_initial": (test.t_initial, 0, 0, 0),
@@ -757,7 +760,7 @@ def test_accelerations(flight_calisto_custom_wind, atol=5e-3):
757760
assert_approx_equal(test.az(t), expected_az, atol, label)
758761

759762

760-
def test_velocities(flight_calisto_custom_wind, atol=5e-3):
763+
def test_velocities(flight_calisto_custom_wind):
761764
"""Tests if the velocity in some particular points of the trajectory is
762765
correct. The expected values were NOT calculated by hand, it was just
763766
copied from the test results. The results are not expected to change,
@@ -771,6 +774,7 @@ def test_velocities(flight_calisto_custom_wind, atol=5e-3):
771774
The absolute tolerance error, by default 5e-3
772775
"""
773776
test = flight_calisto_custom_wind
777+
atol = 5e-3
774778

775779
points = {
776780
"t_initial": (test.t_initial, 0, 0, 0),
@@ -785,7 +789,7 @@ def test_velocities(flight_calisto_custom_wind, atol=5e-3):
785789
assert_approx_equal(test.vz(t), expected_vz, atol, label)
786790

787791

788-
def test_aerodynamic_forces(flight_calisto_custom_wind, atol=5e-3):
792+
def test_aerodynamic_forces(flight_calisto_custom_wind):
789793
"""Tests if the aerodynamic forces in some particular points of the
790794
trajectory is correct. The expected values were NOT calculated by hand, it
791795
was just copied from the test results. The results are not expected to
@@ -799,6 +803,7 @@ def test_aerodynamic_forces(flight_calisto_custom_wind, atol=5e-3):
799803
The absolute tolerance error, by default 5e-3
800804
"""
801805
test = flight_calisto_custom_wind
806+
atol = 5e-3
802807

803808
points = {
804809
"t_initial": (test.t_initial, 1.6542528, 0.65918, -0.067107),
@@ -813,7 +818,7 @@ def test_aerodynamic_forces(flight_calisto_custom_wind, atol=5e-3):
813818
assert_approx_equal(test.R3(t), expected_R3, atol, label)
814819

815820

816-
def test_aerodynamic_moments(flight_calisto_custom_wind, atol=5e-3):
821+
def test_aerodynamic_moments(flight_calisto_custom_wind):
817822
"""Tests if the aerodynamic moments in some particular points of the
818823
trajectory is correct. The expected values were NOT calculated by hand, it
819824
was just copied from the test results. The results are not expected to
@@ -827,6 +832,7 @@ def test_aerodynamic_moments(flight_calisto_custom_wind, atol=5e-3):
827832
The absolute tolerance error, by default 5e-3
828833
"""
829834
test = flight_calisto_custom_wind
835+
atol = 5e-3
830836

831837
points = {
832838
"t_initial": (test.t_initial, 0.17179073815516033, -0.431117, 0),

0 commit comments

Comments
 (0)