Clean up and fix guest_generate_testdata.py
#90
Merged
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
There are several style problems in this file, most notably indentation issues: mixed tabs and spaces, as well as incorrect level of indentation. Correct them, as well as other subtle formatting issues. Signed-off-by: Eric Richter <[email protected]>
…os.path.join An array of paths is _very_ unclear when reading a section of code without context. Use named globals instead so that the reader does not need to move around the file to translate. Also use os.path.join() everywhere instead of manually joining paths with an add operation. This ensures path separators are included where needed, and also helps with portability. Signed-off-by: Eric Richter <[email protected]>
Signed-off-by: Eric Richter <[email protected]>
There is no need to separate the list of variables signed by PK or by KEK, the third element of that list does that for us. Merging them, and using list decompositon, we can simplify the generation functions to use one loop and avoid list access by semi-arbitrary index numbers. Signed-off-by: Eric Richter <[email protected]>
Apparently the directory for golden keys expected by the test cases should be goldenKeys, not goldenkeys. This script would generate test files that would not actually replace the old files, causing any test cases that test update auth files to fail, as they were signed with different keys. Signed-off-by: Eric Richter <[email protected]>
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.
As reported in #89 test data generated by
guest_generate_testdata.pydo not pass the guest test cases. The culprit was a simple directory name typo:goldenkeysvsgoldenKeys. However, as this file was in serious need of clean up, took the time to fix it up as well -- mostly fixing style issues, indentation problems (which I'm rather confused on how this ran in the first place, knowing how picky python is), and other bits of redundant code.There's still a few more things that can probably be cleaned up in this file, I may add a few more commits to this PR before merging.