-
Notifications
You must be signed in to change notification settings - Fork 202
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.
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
Fix #1725 Update time_UT.c to use UtAssert_MIR #1732
Merged
astrogeco
merged 1 commit into
nasa:integration-candidate
from
pepepr08:fix1725-use-mir-macro
Aug 4, 2021
Merged
Fix #1725 Update time_UT.c to use UtAssert_MIR #1732
astrogeco
merged 1 commit into
nasa:integration-candidate
from
pepepr08:fix1725-use-mir-macro
Aug 4, 2021
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
skliper
approved these changes
Jul 29, 2021
pepepr08
added
the
CCB:Ready
Ready for discussion at the Configuration Control Board (CCB)
label
Jul 29, 2021
zanzaben
suggested changes
Jul 29, 2021
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you also update the assert in es_mic_test.c to the new macro.
pepepr08
force-pushed
the
fix1725-use-mir-macro
branch
from
July 29, 2021 19:19
35e0269
to
857ebf3
Compare
zanzaben
approved these changes
Jul 30, 2021
pepepr08
force-pushed
the
fix1725-use-mir-macro
branch
2 times, most recently
from
July 30, 2021 14:38
8b77b79
to
a6fc229
Compare
pepepr08
force-pushed
the
fix1725-use-mir-macro
branch
from
July 30, 2021 14:43
a6fc229
to
a5a9556
Compare
astrogeco
added
conflicts
CCB:Approved
Indicates code review and approval by community CCB
and removed
CCB:Ready
Ready for discussion at the Configuration Control Board (CCB)
labels
Aug 4, 2021
CCB:2021-08-04 APPROVED |
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Aug 4, 2021
nasa/cFE#1742, Remove SB get last message sender info requirement nasa/cFE#1732, Fix #1725 Update UTs to use UtAssert_MIR nasa/cFE#1736, Add Functional Tests cFE Message ID nasa/cFE#1707, Add Time Conversion Functional Test
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Aug 6, 2021
**Combines** nasa/cFE#1759, v6.8.0-rc1+dev810 nasa/osal#1126, v5.1.0-rc1+dev586 **Includes** *cFE* - nasa/cFE#1752, Add null pointer check to table GetAddresses and ReleaseAddresses - nasa/cFE#1742, Remove SB get last message sender info requirement - nasa/cFE#1732, Fix #1725 Update UTs to use UtAssert_MIR - nasa/cFE#1736, Add Functional Tests cFE Message ID - nasa/cFE#1707, Add Time Conversion Functional Test - nasa/cFE#1739, Add cast to MIR prints *osal* - nasa/osal#1122, Add UtAssert_MIR macro - nasa/osal#1125, add generic asserts from CFE coverage testing - nasa/osal#1121, add osapi-shell-stubs.c to OSAL stub library Co-authored-by: Jacob Hageman <skliper@users.noreply.github.com> Co-authored-by: Joseph Hickey <jphickey@users.noreply.github.com> Co-authored-by: Alex Campbell <zanzaben@users.noreply.github.com> Co-authored-by: Jose F Martinez Pedraza <pepepr08@users.noreply.github.com> Co-authored-by: Niall Mullane <nmullane@users.noreply.github.com> Co-authored-by: Ariel Adams <ArielSAdamsNASA@users.noreply.github.com> Co-authored-by: Paul <pavll@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Describe the contribution
Fixes #1725 Updated time_UT.c to start using the new UtAssert_MIR to avoid incorrect use of UtAssertEx.
This update requires nasa/osal#1122 to be merged first. cFS will fail to compile otherwise.
Testing performed
Steps taken to test the contribution:
Pulled OSAL repo with the UtAssert_MIR changes
Rebuild cFS
Run unit tests.... All passed.
Set a custom epoch time
rebuild and run unit tests... All passed.
Manually run ./coverage-time-ALL-testrunner and verify expected output:
[ MIR] 06.004 time_UT.c:902 - Confirm adding seconds = 4294967295, subseconds = 4294967295 to configured EPOCH results in time 0214-039-06:28:15.99999
Manually run functional tests and verify expected output:
EVS Port1 66/1/CFE_TEST_APP 5: [ MIR] 15.001 es_misc_test.c:67 - MIR (Manual Inspection Required) for CFE_ES_WriteToSysLog
Expected behavior changes
No expected changes in behavior.
System(s) tested on
Ubuntu 18.04 VM
Contributor Info - All information REQUIRED for consideration of pull request
Jose F. Martinez Pedraza / NASA GSFC