Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix #1961, Single time domain in functional time tests #1962

Merged
merged 1 commit into from
Sep 21, 2021

Conversation

skliper
Copy link
Contributor

@skliper skliper commented Sep 19, 2021

Describe the contribution

Functional test now uses consistent API's for bounding time, also fixed likely issue with MET rollover causing a false failure.

Testing performed
Build and ran on linux and MCP750, passed

Expected behavior changes
Functional test now passes on systems where OS_GetLocalTime resolution is less than CFE_PSP_GetTime.

System(s) tested on

  • Hardware: Intel i5/Docker, MCP750
  • OS: Ubuntu 18.04, VxWorks 6.9
  • Versions: Bundle main + this commit

Additional context
None

Third party code
None

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

@skliper skliper added the CCB:Ready Ready for discussion at the Configuration Control Board (CCB) label Sep 19, 2021
@skliper skliper added this to the 7.0.0 milestone Sep 19, 2021
@skliper skliper requested a review from pepepr08 September 20, 2021 19:15
{
UtAssert_UINT32_EQ(MET.Seconds, METSeconds);
}
UtAssert_UINT32_LTEQ(METSubSeconds - MET.Subseconds, Range.Subseconds);
Copy link
Contributor

Choose a reason for hiding this comment

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

@skliper will this work for the rollover case too?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, just wraps since they are unsigned.

@astrogeco astrogeco changed the base branch from main to integration-candidate September 21, 2021 01:19
@astrogeco astrogeco merged commit 5f5be83 into nasa:integration-candidate Sep 21, 2021
astrogeco added a commit to nasa/cFS that referenced this pull request Sep 21, 2021
*Combines*

nasa/cFE#1967

*Includes:*

nasa/cFE#1948, Update name of macros/functions added to "cfe_assert"

nasa/cFE#1950, Fix Mismatch between MSG API and test case in "TestMsgId" functional test

nasa/cFE#1962, Single time domain in functional time tests
@astrogeco astrogeco added functional cFE-TIME and removed CCB:Ready Ready for discussion at the Configuration Control Board (CCB) labels Sep 22, 2021
astrogeco added a commit to astrogeco/cFS that referenced this pull request Sep 22, 2021
**Combines**

nasa/cFE#1967 v6.8.0-rc1+dev1024

nasa/osal#1158 v5.1.0-rc1+dev619

nasa/sch_lab#92 v2.4.0-rc1+dev53

nasa/sample_app#155 v1.2.0-rc1+dev73

nasa/to_lab#105 v2.4.0-rc1+dev58

nasa/ci_lab#93 v2.4.0-rc1+dev46

**Includes:**

*cFE*

nasa/cFE#1948, Update name of macros/functions added to "cfe_assert"

nasa/cFE#1950, Fix Mismatch between MSG API and test case in "TestMsgId" functional test

nasa/cFE#1962, Single time domain in functional time tests

nasa/cFE#1943, add missing inclusions in CFE API headers

nasa/cFE#1964, Use existing /ram for FS header test

nasa/cFE#1956, Add static local to function test so data section is nonzero

nasa/cFE#1960, Make invalid buffer length consistent in es task test

nasa/cFE#1953, Only check base filename in library info functional

nasa/cFE#1970, Confirm sb/time reset requirements in coverage test

nasa/cFE#1947, Fix broken link in App Developers Guide

nasa/cFE#1972, Fix #1971, avoid alias warning on some compilers

*osal*

nas/osal#1149, Enable symbol api test and MIR dump too large

nasa/osal#1152, Fix OSAL loader test hard fails if size exceeded

nasa/osal#1155, add bsp-specific configuration flag registry

nasa/osal#1157, Add os-specifc socket flag function

*Apps*

nasa/ci_lab#92, Apply CFE_SB_ValueToMsgId where required

nasa/sample_app#154, Apply CFE_SB_ValueToMsgId where required

nasa/sch_lab#91, Apply CFE_SB_ValueToMsgId where required

nasa/to_lab#104, Apply CFE_SB_ValueToMsgId where required

Co-authored-by: Jacob Hageman   <skliper@users.noreply.github.com>
Co-authored-by: Joseph Hickey   <jphickey@users.noreply.github.com>
Co-authored-by: Adrien Chardon  <nodraak@users.noreply.github.com>
astrogeco added a commit to nasa/cFS that referenced this pull request Sep 22, 2021
**Combines**

nasa/cFE#1967 v6.8.0-rc1+dev1024

nasa/osal#1158 v5.1.0-rc1+dev619

nasa/sch_lab#92 v2.4.0-rc1+dev53

nasa/sample_app#155 v1.2.0-rc1+dev73

nasa/to_lab#105 v2.4.0-rc1+dev58

nasa/ci_lab#93 v2.4.0-rc1+dev46

**Includes:**

*cFE*

nasa/cFE#1948, Update name of macros/functions added to "cfe_assert"

nasa/cFE#1950, Fix Mismatch between MSG API and test case in "TestMsgId" functional test

nasa/cFE#1962, Single time domain in functional time tests

nasa/cFE#1943, add missing inclusions in CFE API headers

nasa/cFE#1964, Use existing /ram for FS header test

nasa/cFE#1956, Add static local to function test so data section is nonzero

nasa/cFE#1960, Make invalid buffer length consistent in es task test

nasa/cFE#1953, Only check base filename in library info functional

nasa/cFE#1970, Confirm sb/time reset requirements in coverage test

nasa/cFE#1947, Fix broken link in App Developers Guide

nasa/cFE#1972, Fix #1971, avoid alias warning on some compilers

*osal*

nas/osal#1149, Enable symbol api test and MIR dump too large

nasa/osal#1152, Fix OSAL loader test hard fails if size exceeded

nasa/osal#1155, add bsp-specific configuration flag registry

nasa/osal#1157, Add os-specifc socket flag function

*Apps*

nasa/ci_lab#92, Apply CFE_SB_ValueToMsgId where required

nasa/sample_app#154, Apply CFE_SB_ValueToMsgId where required

nasa/sch_lab#91, Apply CFE_SB_ValueToMsgId where required

nasa/to_lab#104, Apply CFE_SB_ValueToMsgId where required

Co-authored-by: Jacob Hageman   <skliper@users.noreply.github.com>
Co-authored-by: Joseph Hickey   <jphickey@users.noreply.github.com>
Co-authored-by: Adrien Chardon  <nodraak@users.noreply.github.com>
@astrogeco
Copy link
Contributor

CCB:2021-09-21 APPROVED

@astrogeco astrogeco added the CCB:Approved Indicates code review and approval by community CCB label Sep 22, 2021
@skliper skliper deleted the fix1961-testgettime branch October 22, 2021 19:19
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
CCB:Approved Indicates code review and approval by community CCB cFE-TIME functional
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Functional test can fail if OS_GetLocalTime and CFE_PSP_GetTime resolution is different
3 participants