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 #87, Unit test MID string format now 32bit #94

Merged

Conversation

skliper
Copy link
Contributor

@skliper skliper commented Sep 11, 2020

Describe the contribution
Fix #87
With nasa/cFE#880, the format is now consistently 32 bit, fixed event string check to match.

Testing performed
Built unit tests with nasa/cFE#880, now passes

Expected behavior changes
Unit test pass

System(s) tested on

Additional context
None.

Third party code
None.

Contributor Info - All information REQUIRED for consideration of pull request
Jacob Hageman - NASA/GSFC

@skliper skliper added bug Something isn't working CCB:FastTrack CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) labels Sep 11, 2020
@yammajamma yammajamma added CCB-20200916 and removed CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) labels Sep 16, 2020
@yammajamma yammajamma changed the base branch from main to integration-candidate September 17, 2020 13:50
@yammajamma
Copy link
Contributor

CCB 2020-09-16 APPROVED

@yammajamma yammajamma merged commit 26b0b88 into nasa:integration-candidate Sep 17, 2020
@jphickey
Copy link
Contributor

While this appears to fix the case where v2 headers are used, it breaks v1 headers, where MID remains 0xFFFF not 0xFFFFFFFF.

This is precisely why my original comment regarding checking full event text says its a bad idea to do.
I still recommend to check only the format code, not full text.

@astrogeco
Copy link
Contributor

While this appears to fix the case where v2 headers are used, it breaks v1 headers, where MID remains 0xFFFF not 0xFFFFFFFF.

This is precisely why my original comment regarding checking full event text says its a bad idea to do.
I still recommend to check only the format code, not full text.

should we revert this merge then?

@jphickey
Copy link
Contributor

should we revert this merge then?

See my recommended fix in #99. I pushed as a PR rather than a hotfix commit as it probably warrants a review, but IMO this is what we should have done in the first place.

@astrogeco
Copy link
Contributor

#99 looks like it needs some CCB insight or at least have a review by @skliper. I vote for reverting this so we don't "slow the train down" a second option would be to move forward with the rest of the IC despite it not passing some unit tests.

@jphickey
Copy link
Contributor

I'd vote to revert, rather than have a broken build, if you don't want to fast track #99.

@skliper
Copy link
Contributor Author

skliper commented Sep 21, 2020

While this appears to fix the case where v2 headers are used, it breaks v1 headers, where MID remains 0xFFFF not 0xFFFFFFFF.

This is precisely why my original comment regarding checking full event text says its a bad idea to do.
I still recommend to check only the format code, not full text.

So this change works with nasa/cFE#880, such that it's always 0xFFFFFFFF, as stated in the description. Shouldn't be a broken build, no need to revert, just merge that change also? Although as an example, I'm fine with whatever fix people want to go with (#99 or whatever). This was just a simple update such that nasa/cFE#880 wouldn't break the build.

@jphickey
Copy link
Contributor

Sorry, I didn't notice how nasa/cFE#880 was missed ... But we can do both. They are both still relevant anyway.

I'd like to update sample_app to do format strings only, so it only changes whether it is a hotfix to make UT pass again or if it is just a normal update. There are just too many ways to get into trouble with full text compares. This should make all the event checking more future proof.

@skliper skliper deleted the fix87-msgid-event-string branch February 1, 2021 19:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working CCB:FastTrack
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Unit test fails when VER_2 headers are used
4 participants