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 #1281, remove testrunner and convert testcase to app #1292

Merged
merged 3 commits into from
Apr 22, 2021

Conversation

jphickey
Copy link
Contributor

@jphickey jphickey commented Apr 9, 2021

Describe the contribution

  • Removes the separate CFE "testrunner" module and moves the logic associated with running a test into cfe_assert library.
  • Converts the "testcase" module from a library into an app, by calling into the runner logic that is now inside cfe_assert.

This permits tests to be invoked at any time by issuing the ES "start app" command and specifying the testcase app.

Fixes #1281

Testing performed
Build and sanity check CFE.
Run all currently-implemented functional tests

Expected behavior changes
Each functional test is a separate app, not a library, so it can be started and stopped via ES command like any other app.

System(s) tested on
Ubuntu 20.04

Additional context
Requires #1276 as prerequisite

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

@jphickey jphickey force-pushed the fix-1281-test-app branch from a3007ac to 99be4cd Compare April 12, 2021 19:19
@jphickey
Copy link
Contributor Author

Rebased to latest mainline.

@jphickey jphickey force-pushed the fix-1281-test-app branch from 99be4cd to bf7f7f1 Compare April 12, 2021 19:21
Merge the "testrunner" app and put the runner logic into cfe_assert lib.
Converts the "testcase" library into an app that simply calls the logic
in cfe_assert to do the test.

This means that the test can be run on demand by issuing the ES
start app command, rather than putting it into the startup script.
@jphickey jphickey force-pushed the fix-1281-test-app branch from bf7f7f1 to 422dcac Compare April 12, 2021 19:33
@jphickey jphickey marked this pull request as ready for review April 12, 2021 19:35
@jphickey jphickey added the CCB:Ready Ready for discussion at the Configuration Control Board (CCB) label Apr 12, 2021
Copy link
Contributor

@zanzaben zanzaben left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to also update cFS/cfe/docs/README_functionaltest.md file with the new instructions on how to run the tests.

Adjust the event types so that Start/End are "info" events, not debug
events (in the default platform config, debug events are not shown).

Also update documentation to correct the startup script entries.
@jphickey
Copy link
Contributor Author

Need to also update cFS/cfe/docs/README_functionaltest.md file with the new instructions on how to run the tests.

Updated in ec2d2f6

@skliper skliper added CCB:2021-04-14 and removed CCB:Ready Ready for discussion at the Configuration Control Board (CCB) labels Apr 14, 2021
@skliper
Copy link
Contributor

skliper commented Apr 14, 2021

CCB:2021-04-14 - APPROVED

@skliper skliper requested a review from zanzaben April 14, 2021 17:45
Copy link
Contributor

@zanzaben zanzaben left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2 of the test are failing and need to be updated.

Test App Info -> EntryPt (line 66)
Test App Info -> FileName (line 69)

Use a constant at the top of the file, and change the
names to match current environment.
@jphickey jphickey force-pushed the fix-1281-test-app branch from e4afd35 to 23c835b Compare April 20, 2021 14:58
@jphickey
Copy link
Contributor Author

Corrected string checks in commit 23c835b

@astrogeco astrogeco added CCB:FastTrack CCB:Approved Indicates code review and approval by community CCB labels Apr 22, 2021
@astrogeco astrogeco changed the base branch from main to integration-candidate April 22, 2021 15:18
@astrogeco astrogeco force-pushed the integration-candidate branch from 59839e3 to 3f9f7f5 Compare April 22, 2021 15:19
@astrogeco astrogeco merged commit 066ffff into nasa:integration-candidate Apr 22, 2021
astrogeco added a commit to nasa/cFS that referenced this pull request Apr 22, 2021
nasa/cFE#1292, Remove testrunner and convert testcase to app
astrogeco added a commit to nasa/cFS that referenced this pull request Apr 22, 2021
Combines:

nasa/cFE#1406
nasa/osal#967
nasa/cFS-GroundSystem#178

Includes:

nasa/cFE#1290, Split interface and implementation modules
nasa/cFE#1376, add docs to CFE_ES_RegisterCDS() regarding clearing
nasa/cFE#1292, Remove testrunner and convert testcase to app
cfe-IC:2021-04-20, HOTFIX: Always build cfe_assert.

nasa/osal#950, Eliminate time and access name collisions with VxWorks
nasa/osal#946, Fix Shell implementation on posix and rtems

nasa/cFS-GroundSystem#174, update executable name and version in setup.py
nasa/cFS-GroundSystem#175, Add executable install guide
astrogeco added a commit to nasa/cFS that referenced this pull request Apr 22, 2021
Combines:

nasa/cFE#1406
nasa/osal#967
nasa/cFS-GroundSystem#178

Includes:

nasa/cFE#1290, Split interface and implementation modules
nasa/cFE#1376, add docs to CFE_ES_RegisterCDS() regarding clearing
nasa/cFE#1292, Remove testrunner and convert testcase to app
cfe-IC:2021-04-20, HOTFIX: Always build cfe_assert.

nasa/osal#950, Eliminate time and access name collisions with VxWorks
nasa/osal#946, Fix Shell implementation on posix and rtems

nasa/cFS-GroundSystem#174, update executable name and version in setup.py
nasa/cFS-GroundSystem#175, Add executable install guide
zanzaben pushed a commit to zanzaben/cFE that referenced this pull request Apr 22, 2021
Fix nasa#1281, remove testrunner and convert testcase to app
@jphickey jphickey deleted the fix-1281-test-app branch May 14, 2021 14:23
@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 CCB:FastTrack
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Make functional tests runnable via CFE_ES_START_APP_CC command
4 participants