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 #106, Refactor UT_SetForceFail to UT_SetDefaultReturnValue #107

Merged

Conversation

zanzaben
Copy link
Contributor

@zanzaben zanzaben commented Nov 6, 2020

Describe the contribution
Fixes #106 by changing UT_SetForceFail to UT_SetDefaultReturnValue

Testing performed
Build and run unit test

Expected behavior changes
No impact to behavior

System(s) tested on
Ubuntu 20.04

Additional context
Dependant on nasa/osal#646

Contributor Info - All information REQUIRED for consideration of pull request
Alex Campbell - NASA/GSFC

@zanzaben zanzaben added dependency CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) labels Nov 6, 2020
@astrogeco astrogeco changed the title Refactoring UT_SetForceFail to UT_SetDefaultReturnValue Fix #106, Refactor UT_SetForceFail to UT_SetDefaultReturnValue Nov 12, 2020
@astrogeco astrogeco added CCB-20201112 and removed CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) labels Nov 13, 2020
@astrogeco astrogeco changed the base branch from main to integration-candidate December 1, 2020 04:21
@astrogeco astrogeco added the conflict This PR has merge conflicts label Dec 1, 2020
@astrogeco
Copy link
Contributor

astrogeco commented Dec 1, 2020

@skliper and @zanzaben please resolve the conflict here

@zanzaben zanzaben force-pushed the fix106-Rename-SetForceFail branch from 39b1e37 to 0c2cf18 Compare December 1, 2020 13:12
@zanzaben zanzaben removed the conflict This PR has merge conflicts label Dec 1, 2020
@astrogeco astrogeco merged commit 5fe5693 into nasa:integration-candidate Dec 1, 2020
astrogeco pushed a commit that referenced this pull request Dec 1, 2020
New function name is UT_SetDefaultReturnValue
astrogeco pushed a commit that referenced this pull request Dec 1, 2020
New function name is UT_SetDefaultReturnValue
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Refactor UT_SetForceFail
3 participants