Skip to content

Commit 0be1b20

Browse files
committed
clear history to not get caught in 1 twice
1 parent e951687 commit 0be1b20

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

FprimeZephyrReference/test/int/antenna_deployer_test.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -121,19 +121,16 @@ def test_change_quiet_time_sec(fprime_test_api: IntegrationTestAPI, start_gds):
121121
def test_multiple_deploy_attempts(fprime_test_api: IntegrationTestAPI, start_gds):
122122
"""Changes the deploy attempts parameter and ensures the burnwire deploys multiple times"""
123123

124-
# Set parameters for multiple attempts with short delays
125-
# Override the fixture's MAX_DEPLOY_ATTEMPTS=1 with our test value of 3
124+
# Set parameters after fixture has run to override fixture values
126125
proves_send_and_assert_command(
127126
fprime_test_api, f"{antenna_deployer}.MAX_DEPLOY_ATTEMPTS_PRM_SET", [3]
128127
)
129128
proves_send_and_assert_command(
130129
fprime_test_api, f"{antenna_deployer}.RETRY_DELAY_SEC_PRM_SET", [1]
131130
)
132-
133131
proves_send_and_assert_command(
134132
fprime_test_api, f"{antenna_deployer}.QUIET_TIME_SEC_PRM_SET", [0]
135133
)
136-
137134
proves_send_and_assert_command(
138135
fprime_test_api, f"{antenna_deployer}.BURN_DURATION_SEC_PRM_SET", [1]
139136
)
@@ -151,6 +148,9 @@ def test_multiple_deploy_attempts(fprime_test_api: IntegrationTestAPI, start_gds
151148
fprime_test_api.assert_event(f"{burnwire}.SetBurnwireState", "ON", timeout=2)
152149
fprime_test_api.assert_event(f"{burnwire}.SetBurnwireState", "OFF", timeout=15)
153150

151+
# Clear histories to avoid finding the first attempt again
152+
fprime_test_api.clear_histories()
153+
154154
# Wait for retry delay and verify second attempt
155155
attempt_event = fprime_test_api.assert_event(
156156
f"{antenna_deployer}.DeployAttempt", timeout=15
@@ -161,6 +161,9 @@ def test_multiple_deploy_attempts(fprime_test_api: IntegrationTestAPI, start_gds
161161
fprime_test_api.assert_event(f"{burnwire}.SetBurnwireState", "ON", timeout=2)
162162
fprime_test_api.assert_event(f"{burnwire}.SetBurnwireState", "OFF", timeout=15)
163163

164+
# Clear histories to avoid finding previous attempts
165+
fprime_test_api.clear_histories()
166+
164167
# Wait for retry delay and verify third attempt
165168
attempt_event = fprime_test_api.assert_event(
166169
f"{antenna_deployer}.DeployAttempt", timeout=15
@@ -182,11 +185,10 @@ def test_multiple_deploy_attempts(fprime_test_api: IntegrationTestAPI, start_gds
182185
def test_burn_duration_sec(fprime_test_api: IntegrationTestAPI, start_gds):
183186
"""Changes the burn duration sec parameter and ensures the burnwire burns for that long based on the burnwire events"""
184187

185-
# Set a specific burn duration (3 seconds) to test the parameter
188+
# Set parameters after fixture has run to override fixture values
186189
proves_send_and_assert_command(
187190
fprime_test_api, f"{antenna_deployer}.BURN_DURATION_SEC_PRM_SET", [3]
188191
)
189-
190192
proves_send_and_assert_command(
191193
fprime_test_api, f"{antenna_deployer}.QUIET_TIME_SEC_PRM_SET", [0]
192194
)
@@ -197,6 +199,7 @@ def test_burn_duration_sec(fprime_test_api: IntegrationTestAPI, start_gds):
197199
fprime_test_api, f"{antenna_deployer}.MAX_DEPLOY_ATTEMPTS_PRM_SET", [1]
198200
)
199201

202+
fprime_test_api.clear_histories()
200203
# Start deployment
201204
proves_send_and_assert_command(fprime_test_api, f"{antenna_deployer}.DEPLOY")
202205

@@ -227,4 +230,3 @@ def test_burn_duration_sec(fprime_test_api: IntegrationTestAPI, start_gds):
227230
f"{antenna_deployer}.DeployFinish", timeout=10
228231
)
229232
assert finish_event.args[0].val == "DEPLOY_RESULT_FAILED"
230-
assert finish_event.args[1].val == 1

0 commit comments

Comments
 (0)