utils/cpu: Check cpu list for s390x [v4] #2357
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The output in /proc/cpuinfo is different between s390x and other archs. This is to support to parse the output on s390x. Signed-off-by: Dan Zheng <[email protected]> Signed-off-by: Cleber Rosa <[email protected]>
This simple test, after the s390x version, checks the proper parsing of and x86_64 /proc/cpuinfo. Signed-off-by: Cleber Rosa <[email protected]>
apahim
reviewed
Dec 15, 2017
| @@ -115,7 +115,8 @@ if [ "$TRAVIS" == "true" ]; then | |||
| else | |||
| run_rc lint 'inspekt lint --exclude=.git --enable W0102,W0611' | |||
| fi | |||
| run_rc indent 'inspekt indent --exclude=.git' | |||
| # Skip checking test_utils_cpu.py due to inspektor bug | |||
There was a problem hiding this comment.
Do we have a way to monitor the bug status? If yes, please include the check in selftests/functional/test_thirdparty_bugs.py
There was a problem hiding this comment.
Yep, good point. This is also tracked in GitHub. Will add it.
apahim
reviewed
Dec 15, 2017
selftests/unit/test_utils_cpu.py
Outdated
| @@ -87,6 +87,229 @@ def test_s390x(self): | |||
| return_value=self._get_file_mock(s390x_2)): | |||
| self.assertEqual(len(cpu.cpu_online_list()), 4) | |||
|
|
|||
| def test_x86_64(self): | |||
| x86_64 = u"""processor : 0 | |||
| vendor_id : GenuineIntel | |||
There was a problem hiding this comment.
Please move this content to selftests/.data.
There was a problem hiding this comment.
I tend to favor inline content, for both locality and for making packaging easier. It looks like you meant that moving this to a file is a must, but please clarify that to me and I'll take a look at it.
There was a problem hiding this comment.
No, not a must, just a soft-request. You can keep it here.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The output in /proc/cpuinfo is different between s390x and other archs.
This is to support to parse the output on s390x.
Signed-off-by: Dan Zheng [email protected]
Signed-off-by: Cleber Rosa [email protected]
Changes from v3 (#2353):
Changes from v2 (#2351):
Changes from v1 (#2300):
/proc/cpuinfoon s390x