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.

Sign up for GitHub

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

Jump to bottom

Fix #693, Utilize UT macros in sb_UT #698

Merged
merged 2 commits into from
May 19, 2020
Merged

Fix #693, Utilize UT macros in sb_UT #698

merged 2 commits into from
May 19, 2020

Conversation

CDKnightNASA
Copy link
Contributor

@CDKnightNASA CDKnightNASA commented May 11, 2020 •
edited by skliper
Loading

Describe the contribution
cleanup of sb_UT.c

Fix #693
Fix #418

Contributor Info - All information REQUIRED for consideration of pull request
Christopher.D.Knight@nasa.gov

EDIT: Added fix #418

@CDKnightNASA CDKnightNASA self-assigned this May 11, 2020
@CDKnightNASA CDKnightNASA requested a review from skliper May 11, 2020 18:14
CDKnightNASA
CDKnightNASA commented May 11, 2020
View reviewed changes
fsw/cfe-core/unit-test/sb_UT.c Outdated
@@ -6016,7 +6002,7 @@ void Test_RcvMsg_UnsubResubPath(void)
SETUP(CFE_SB_Subscribe(MsgId, PipeId));
ASSERT(CFE_SB_RcvMsg(&PtrToMsg, PipeId, CFE_SB_PEND_FOREVER));

ASSERT_TRUE(PtrToMsg == NULL);
Copy link
Contributor Author

Choose a reason for hiding this comment

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

So this is curious, I need to confirm that the behavior has changed...But I believe the new behavior is correct (this is probably a side-effect of one of the other merges).

@skliper
Copy link
Contributor

skliper commented May 11, 2020 •
edited
Loading

Recommended commit - Fix #693, Add MID wrap and minor UT cleanup

For the second one only... I'd keep the first one separate. Or to retain links:

Fix #693, Add MID wrap and minor UT cleanup

Cleanup related to #666 and #532

@skliper skliper changed the title fix #683, sb_UT use of new macros Fix #693, Utilize UT macros in sb_UT May 12, 2020
@skliper skliper linked an issue May 12, 2020 that may be closed by this pull request
Utilize new macros and correct some sb_UT.c merge conflicts #693
Closed
@skliper skliper mentioned this pull request May 12, 2020
Closed
skliper added a commit to skliper/cFS that referenced this pull request May 12, 2020
@skliper
Test nasa/cFE#698 pr
64de876
@skliper
Copy link
Contributor

skliper commented May 12, 2020

Failure reported by bundle CI, with OMIT_DEPRECATED=true.

Note - to recreate, from cFS bundle create a branch that references the cfe submodule w/ this commit and push to your fork. Results can be seen on travis-ci.com.

https://travis-ci.com/github/skliper/cFS/builds/165453917

/home/travis/build/skliper/cFS/cfe/fsw/cfe-core/unit-test/sb_UT.c: In function ‘Test_OS_MutSem_ErrLogic’:
/home/travis/build/skliper/cFS/cfe/fsw/cfe-core/unit-test/sb_UT.c:5668:53: error: ‘CFE_OS_SEM_FAILURE’ undeclared (first use in this function); did you mean ‘OS_SEM_FAILURE’?
     UT_SetDeferredRetcode(UT_KEY(OS_MutSemTake), 1, CFE_OS_SEM_FAILURE);
                                                     ^~~~~~~~~~~~~~~~~~
                                                     OS_SEM_FAILURE
/home/travis/build/skliper/cFS/cfe/fsw/cfe-core/unit-test/sb_UT.c:5668:53: note: each undeclared identifier is reported only once for each function it appears in

@CDKnightNASA
Copy link
Contributor Author

Failure reported by bundle CI, with OMIT_DEPRECATED=true.

Note - to recreate, from cFS bundle create a branch that references the cfe submodule w/ this commit and push to your fork. Results can be seen on travis-ci.com.

https://travis-ci.com/github/skliper/cFS/builds/165453917

/home/travis/build/skliper/cFS/cfe/fsw/cfe-core/unit-test/sb_UT.c: In function ‘Test_OS_MutSem_ErrLogic’:
/home/travis/build/skliper/cFS/cfe/fsw/cfe-core/unit-test/sb_UT.c:5668:53: error: ‘CFE_OS_SEM_FAILURE’ undeclared (first use in this function); did you mean ‘OS_SEM_FAILURE’?
     UT_SetDeferredRetcode(UT_KEY(OS_MutSemTake), 1, CFE_OS_SEM_FAILURE);
                                                     ^~~~~~~~~~~~~~~~~~
                                                     OS_SEM_FAILURE
/home/travis/build/skliper/cFS/cfe/fsw/cfe-core/unit-test/sb_UT.c:5668:53: note: each undeclared identifier is reported only once for each function it appears in

fixed

@skliper skliper added this to the 6.8.0 milestone May 12, 2020
@skliper
Copy link
Contributor

skliper commented May 12, 2020

@CDKnightNASA could you link the passing bundle CI?

@CDKnightNASA
Copy link
Contributor Author

@CDKnightNASA could you link the passing bundle CI?

https://travis-ci.com/github/CDKnightNASA/cFS/jobs/332918553

@skliper
Copy link
Contributor

skliper commented May 13, 2020

CCB 20200513 - Approved

@astrogeco astrogeco added CCB:Approved Indicates code review and approval by community CCB IC-20200513 labels May 19, 2020
@astrogeco astrogeco merged commit db6f048 into nasa:integration-candidate May 19, 2020
@skliper skliper mentioned this pull request Jan 6, 2021
Closed
@skliper skliper linked an issue Jan 6, 2021 that may be closed by this pull request
many unit tests report event count errors as hex #418
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@skliper skliper skliper approved these changes

Assignees

@CDKnightNASA CDKnightNASA

Labels
CCB:Approved Indicates code review and approval by community CCB enhancement unit-test
Projects
None yet
Milestone
Bootes
Development

Successfully merging this pull request may close these issues.

Utilize new macros and correct some sb_UT.c merge conflicts many unit tests report event count errors as hex
3 participants
@CDKnightNASA @skliper @astrogeco