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.

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 #1680 #1681 #1682, add software bus tests #1803

Merged

Conversation

jphickey
Copy link
Contributor

Describe the contribution
Adds functional testing for CFE SB APIs: subscription, message passing, zero copy.

Fixes #1680
Fixes #1681
Fixes #1682

Testing performed
Build and run all tests, confirm log outputs as expected

Expected behavior changes
Additional APIs are functional tested

System(s) tested on
Ubuntu

Additional context
Currently requires PR #1790 as dependency (will rebase once finalized)

Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.

@jphickey jphickey added the CCB:Ready Ready for discussion at the Configuration Control Board (CCB) label Aug 11, 2021
@jphickey
Copy link
Contributor Author

This will need a rebase onto the next/upcoming main branch, holding as draft for now, but it can still be initially reviewed in current form.

@jphickey jphickey changed the title Fix 1680 1681 1682 test sb msg Fix #1680 #1681 #1682, add software bus tests Aug 11, 2021
@astrogeco astrogeco added conflicts and removed CCB:Ready Ready for discussion at the Configuration Control Board (CCB) labels Aug 11, 2021
@astrogeco
Copy link
Contributor

astrogeco commented Aug 11, 2021

CCB:2021-08-11

  • Pending on discussion of Ut_ASSERT_SUCCESS
  • Test logic is good

@jphickey jphickey force-pushed the fix-1680-1681-1682-test-sb-msg branch from 7ebe2e3 to 83f2930 Compare August 11, 2021 19:31
@jphickey
Copy link
Contributor Author

Rebased to fix conflicts. Still a draft for now, pending PR #1790

@astrogeco astrogeco added the CCB:Approved Indicates code review and approval by community CCB label Aug 11, 2021
Add tests for the CFE SB subscription API:
 - CFE_SB_Subscribe
 - CFE_SB_SubscribeEx
 - CFE_SB_SubscribeLocal
 - CFE_SB_Unsubscribe
 - CFE_SB_UnsubscribeLocal
@jphickey jphickey force-pushed the fix-1680-1681-1682-test-sb-msg branch from 83f2930 to 73a1d07 Compare August 17, 2021 18:09
@jphickey
Copy link
Contributor Author

Rebased to latest "main" branch, dependencies should be resolved now, pending successful CI run.

@jphickey jphickey force-pushed the fix-1680-1681-1682-test-sb-msg branch from 73a1d07 to 7fcf4b9 Compare August 17, 2021 18:55
@jphickey
Copy link
Contributor Author

Updated to add new test Msg IDs to sample cpu_msgids.h file.

Add tests for the basic message passing API:
 - CFE_SB_TransmitMsg
 - CFE_SB_ReceiveBuffer
Add tests for the CFE SB subscription API:
- CFE_SB_AllocateMessageBuffer
- CFE_SB_ReleaseMessageBuffer
- CFE_SB_TransmitBuffer
@jphickey jphickey force-pushed the fix-1680-1681-1682-test-sb-msg branch from 7fcf4b9 to 9c66b21 Compare August 17, 2021 19:26
@jphickey jphickey marked this pull request as ready for review August 17, 2021 19:36
@jphickey
Copy link
Contributor Author

And just note for awareness: the message passing tests use a unique MsgID so as to not conflict/interfere with other SB messages. In the default/sample config I used the open slots at 0x1802 (cmd) and 0x0802 (tlm) for this purpose.

@astrogeco astrogeco changed the base branch from main to integration-candidate August 18, 2021 13:54
@astrogeco astrogeco merged commit 3931e45 into nasa:integration-candidate Aug 18, 2021
astrogeco added a commit to nasa/cFS that referenced this pull request Aug 18, 2021
astrogeco added a commit to nasa/cFS that referenced this pull request Aug 20, 2021
astrogeco added a commit to nasa/cFS that referenced this pull request Aug 21, 2021
**Combines**

nasa/cFE# v6.8.0-rc1+dev933
nasa/osal# v5.1.0-rc1+dev594

**Includes**

*osal*

nasa/osal#1131, add test case types similar to NA

*cFE*

nasa/cFE#1803, Add software bus tests
nasa/cFE#1756, separate variable for OSAL status
nasa/cFE#1809, increase SB pool max size bucket
nasa/cFE#1842, Add Null check for CFE_ResourceId_FindNext
nasa/cFE#1828, Improve TBL coverage tests
nasa/cFE#1833, Clean up Message ID Functional Test #1824, Add missing cases for msg id func tests
nasa/cFE#1832, Combine SB Set/Get message characteristics group #1831, Consolidate msg get/set doxygen group
nasa/cFE#1836, Adding coverage tests to cFE TIME
nasa/cFE#1848, enable strict resource id w/OMIT_DEPRECATED
nasa/cFE#1845, HOTFIX IC-20210819, type correction TBL coverage test
nasa/cFE#1806, Add test for ES BackgroundWakeup
nasa/cFE#1813, Success Test for CFE_ES_RestartApp
nasa/cFE#1814, Subscribe to Message Limit Greater Than CFE_PLATFORM_SB_DEFAULT_MSG_LIMIT
nasa/cFE#1811, Success Test for CFE_ES_GetMemPoolStats
nasa/cFE#1822, Group MSG APIs documentation by header type
nasa/cFE#1816, add retroactive CFE status asserts
nasa/cFE#1854, remove unused CFE_TBL_ERR_BAD_APP_ID
nasa/cFE#1855, correct syslog message in pool create
nasa/cFE#1853, remove unused CFE_ES_POOL_BOUNDS_ERROR
nasa/cFE#1859, remove unused CFE_TBL_ERR_FILE_NOT_FOUND
nasa/cFE#1856, Check error ctr to TransmitMsg test
nasa/cFE#1857, End Child Task requirement remove error code
nasa/cFE#1782, Add functional tests for resource misc

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: Niall Mullane           <nmullane@users.noreply.github.com>
Co-authored-by: Ariel Adams             <ArielSAdamsNASA@users.noreply.github.com>
Co-authored-by: Jose F Martinez Pedraza <pepepr08@users.noreply.github.com>
@jphickey jphickey deleted the fix-1680-1681-1682-test-sb-msg branch August 23, 2021 17:55
@skliper skliper added this to the 7.0.0 milestone Sep 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CCB:Approved Indicates code review and approval by community CCB
Projects
None yet
3 participants