Skip to content

Fix #812 Add Perf API functional tests#1800

Merged
astrogeco merged 2 commits intonasa:integration-candidatefrom
pepepr08:fix812-perf-ft
Aug 16, 2021
Merged

Fix #812 Add Perf API functional tests#1800
astrogeco merged 2 commits intonasa:integration-candidatefrom
pepepr08:fix812-perf-ft

Conversation

@pepepr08
Copy link
Contributor

@pepepr08 pepepr08 commented Aug 10, 2021 •
edited
Loading

Describe the contribution
Fixes #812
Add Perf API functional tests and Add Perf Trigger and Perf Start commands to functional test workflow.
Functional Test will now send a command to set a Perf trigger, send command to start capturing Perf data and finally send command to start running the functional tests.

Testing performed
Steps taken to test the contribution:

  1. Build with tests enabled
  2. Run cFS
  3. Send commands to set Perf trigger, and start Perf data
  4. Send command to run Functional Tests
  5. Verify tests pass
  6. Push code to Github and verify workflow works

Expected behavior changes
New tests added to functional tests. Workflow now sends two more commands to cFS.

System(s) tested on

  • OS: Ubuntu 18.04 VM

Contributor Info - All information REQUIRED for consideration of pull request
Jose F. Martinez Pedraza / NASA GSFC

@pepepr08 pepepr08 changed the title Fix #812 Add Perf API functional tests (WIP) Fix #812 Add Perf API functional tests Aug 10, 2021
@pepepr08 pepepr08 force-pushed the fix812-perf-ft branch 3 times, most recently from 3cb23a1 to ffe7df7 Compare August 11, 2021 14:48
@pepepr08 pepepr08 changed the title (WIP) Fix #812 Add Perf API functional tests Fix #812 Add Perf API functional tests Aug 11, 2021
@pepepr08 pepepr08 added the CCB:Ready Ready for discussion at the Configuration Control Board (CCB) label Aug 11, 2021
@pepepr08 pepepr08 marked this pull request as ready for review August 11, 2021 14:58
@astrogeco astrogeco removed the CCB:Ready Ready for discussion at the Configuration Control Board (CCB) label Aug 11, 2021
@pepepr08 pepepr08 added the CCB:Ready Ready for discussion at the Configuration Control Board (CCB) label Aug 11, 2021
@astrogeco astrogeco added 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 11, 2021
@astrogeco
Copy link
Contributor

astrogeco commented Aug 11, 2021

CCB:2021-08-11 APPROVED

astrogeco
astrogeco suggested changes Aug 11, 2021
View reviewed changes
@astrogeco
Copy link
Contributor

astrogeco commented Aug 11, 2021 •
edited
Loading

CCB:2021-08-11 APPROVED with CHANGES

  • consider splitting into two commits, one for yml and one for the rest
  • Split up tests

astrogeco
astrogeco suggested changes Aug 11, 2021
View reviewed changes
@pepepr08 pepepr08 force-pushed the fix812-perf-ft branch 2 times, most recently from a4dd672 to efd5f25 Compare August 11, 2021 16:37
@pepepr08
Copy link
Contributor Author

pepepr08 commented Aug 11, 2021

I split the test into four functions. I think log looks better now.

[BEGIN] 20 Test PerfLogEntry
[ PASS] 20.001 es_perf_test.c:36 - CFE_ES_PerfLogEntry(0)
[ PASS] 20.002 es_perf_test.c:37 - CFE_ES_PerfLogEntry(CFE_MISSION_ES_PERF_MAX_IDS - 1)
[ PASS] 20.003 es_perf_test.c:38 - CFE_ES_PerfLogEntry(CFE_MISSION_ES_PERF_MAX_IDS)
[  END] 20 Test PerfLogEntry    TOTAL::3     PASS::3     FAIL::0     MIR::0     TSF::0     TTF::0     N/A::0   

[BEGIN] 21 Test PerfLogExit
[ PASS] 21.001 es_perf_test.c:43 - CFE_ES_PerfLogExit(0)
[ PASS] 21.002 es_perf_test.c:44 - CFE_ES_PerfLogExit(CFE_MISSION_ES_PERF_MAX_IDS - 1)
[ PASS] 21.003 es_perf_test.c:45 - CFE_ES_PerfLogExit(CFE_MISSION_ES_PERF_MAX_IDS)
[  END] 21 Test PerfLogExit     TOTAL::3     PASS::3     FAIL::0     MIR::0     TSF::0     TTF::0     N/A::0   

[BEGIN] 22 Test PerfLogAdd
[ PASS] 22.001 es_perf_test.c:50 - CFE_ES_PerfLogAdd(0, 0)
[ PASS] 22.002 es_perf_test.c:51 - CFE_ES_PerfLogAdd(0, 1)
[ PASS] 22.003 es_perf_test.c:52 - CFE_ES_PerfLogAdd(0, 0xFFFFFFFF)
[ PASS] 22.004 es_perf_test.c:53 - CFE_ES_PerfLogAdd(CFE_MISSION_ES_PERF_MAX_IDS - 1, 0)
[ PASS] 22.005 es_perf_test.c:54 - CFE_ES_PerfLogAdd(CFE_MISSION_ES_PERF_MAX_IDS - 1, 1)
[ PASS] 22.006 es_perf_test.c:55 - CFE_ES_PerfLogAdd(CFE_MISSION_ES_PERF_MAX_IDS - 1, 0xFFFFFFFF)
[ PASS] 22.007 es_perf_test.c:56 - CFE_ES_PerfLogAdd(CFE_MISSION_ES_PERF_MAX_IDS, 0)
[ PASS] 22.008 es_perf_test.c:57 - CFE_ES_PerfLogAdd(CFE_MISSION_ES_PERF_MAX_IDS, 1)
[ PASS] 22.009 es_perf_test.c:58 - CFE_ES_PerfLogAdd(CFE_MISSION_ES_PERF_MAX_IDS, 0xFFFFFFFF)
[  END] 22 Test PerfLogAdd      TOTAL::9     PASS::9     FAIL::0     MIR::0     TSF::0     TTF::0     N/A::0   

[BEGIN] 23 Test Perf Trigger
[ PASS] 23.001 es_perf_test.c:64 - CFE_ES_PerfLogEntry(126)
[ PASS] 23.002 es_perf_test.c:65 - CFE_ES_PerfLogExit(126)
[  END] 23 Test Perf Trigger    TOTAL::2     PASS::2     FAIL::0     MIR::0     TSF::0     TTF::0     N/A::0

@pepepr08
Fix nasa#812 Add Perf API functional tests
c5e7165 
and add Perf Trigger and Perf Start commands to functional tests workflow
@pepepr08
Fix nasa#812 Start Perf Data before running tests
6887fbf
@pepepr08
Copy link
Contributor Author

pepepr08 commented Aug 11, 2021

Split single commit into two commits.

@astrogeco astrogeco changed the base branch from main to integration-candidate August 16, 2021 19:28
@astrogeco astrogeco merged commit 9da565a into nasa:integration-candidate Aug 16, 2021
This was referenced Aug 16, 2021
Merged
Merged
astrogeco added a commit to nasa/cFS that referenced this pull request Aug 16, 2021
@astrogeco
Add nasa/cFE#1800, Add Perf API functional tests
fc65853
astrogeco added a commit to nasa/cFS that referenced this pull request Aug 17, 2021
@astrogeco @skliper
@jphickey @zanzaben @nmullane @PavLL
IC:2021-08-17, cFE v6.8.0-rc1+dev
c2119ea 
**Combines**

nasa/cFE#1808, v6.8.0-rc1+dev873

**Includes**

- nasa/cFE#1790, Port "CFE_UtAssert_SuccessCheck" and related macros from coverage test to functional test #1784, add CFE assert macros to functional test
- nasa/cFE#1779, Adds invalid id syslog to for CFE_ES_DeleteApp and CFE_ES_ReloadApp and verifies required reporting
- nasa/cFE#1785, Stop memory leak & add cds size test.
- nasa/cFE#1765, Mark read only inputs as const
- nasa/cFE#1804, Check resource ID idx is less than max
- nasa/cFE#1778, Add ES Application Behavior Functional Tests
- nasa/cFE#1801, Update CFE_ES_RunLoop documentation
- nasa/cFE#1745, Add Message Api Functional Test
- nasa/cFE#1798, update in/out status and nonnull/nonzero tags
- nasa/cFE#1783, Add External Time Source Functional Tests
- nasa/cFE#1800, Add Perf API functional tests

Co-authored-by: Jacob Hageman <[email protected]>
Co-authored-by: Joseph Hickey <[email protected]>
Co-authored-by: Alex Campbell <[email protected]>
Co-authored-by: Niall Mullane <[email protected]>
Co-authored-by: Paul <[email protected]>
astrogeco added a commit to nasa/cFS that referenced this pull request Aug 17, 2021
@astrogeco @skliper
@jphickey @zanzaben @nmullane @PavLL
IC:2021-08-17, cFE v6.8.0-rc1+dev873
94721a6 
**Combines**

nasa/cFE#1808, v6.8.0-rc1+dev873

**Includes**

- nasa/cFE#1790, Port "CFE_UtAssert_SuccessCheck" and related macros from coverage test to functional test #1784, add CFE assert macros to functional test
- nasa/cFE#1779, Adds invalid id syslog to for CFE_ES_DeleteApp and CFE_ES_ReloadApp and verifies required reporting
- nasa/cFE#1785, Stop memory leak & add cds size test.
- nasa/cFE#1765, Mark read only inputs as const
- nasa/cFE#1804, Check resource ID idx is less than max
- nasa/cFE#1778, Add ES Application Behavior Functional Tests
- nasa/cFE#1801, Update CFE_ES_RunLoop documentation
- nasa/cFE#1745, Add Message Api Functional Test
- nasa/cFE#1798, update in/out status and nonnull/nonzero tags
- nasa/cFE#1783, Add External Time Source Functional Tests
- nasa/cFE#1800, Add Perf API functional tests

Co-authored-by: Jacob Hageman <[email protected]>
Co-authored-by: Joseph Hickey <[email protected]>
Co-authored-by: Alex Campbell <[email protected]>
Co-authored-by: Niall Mullane <[email protected]>
Co-authored-by: Paul <[email protected]>
@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

Reviewers

@jphickey jphickey Awaiting requested review from jphickey

2 more reviewers

@zanzaben zanzaben zanzaben approved these changes

@astrogeco astrogeco astrogeco approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

CCB:Approved Indicates code review and approval by community CCB

Projects

None yet

Milestone

Caelum

Development

Successfully merging this pull request may close these issues.

Add functional tests for cFE Performance Monitor APIs

4 participants

@pepepr08 @astrogeco @zanzaben @skliper