Add bad manifest filenames tests #845
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
Add another forbidden file name in submissions: prog.alt (prog.alt.c is allowed). Modularise the checks for invalid filenames in entries. For instance in check_extra_file() there's no need to check each extra filename and then give the same error message changing the macro of the filename that's disallowed when we can just print the string being tested against. The only difference is that there's one if (with multiple checks) and instead of duplicating the same error message we just print it once with the string being tested against. Note that there are two sets of checks: one for extra files being required filenames and another for disallowed filenames. Make sure to use the macros for the filenames, not the literal strings (e.g. use PROG_FILENAME not "prog"). Check filenames in alphabetical order (I think :-) .. very tired so maybe missed one or two). Note that the function check_extra_file() CANNOT be used in every case so it's not used except in chkentry!
Each forbidden filename in the manifest now has a separate file to check it including prog.alt. The -34.json file was also updated to have prog.alt as an extra filename though it might be better to also check this for other files too if this is not done (been too long and too many other changes in the other repo to recall if this is done or not). That means that under test_ioccc/test_JSON/info.json/bad individual files that have an extra file with the names of: - README.md - index.html - inventory.html - prog - prog.alt - prog.orig - prog.orig.c have been added. Unless other files have to be added later to the list of disallowed filenames or there needs to be a more specific check in mkiocccentry for filenames of the required files this should complete the disallowed and required filenames checks.
|
Thanks @xexyl Going back to sleep 🛌 🥱 😴 |
Hope you got some sleep! |
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.
Each forbidden filename in the manifest now has a separate file to check
it including prog.alt. The -34.json file was also updated to have
prog.alt as an extra filename though it might be better to also check
this for other files too if this is not done (been too long and too many
other changes in the other repo to recall if this is done or not).
That means that under test_ioccc/test_JSON/info.json/bad individual
files that have an extra file with the names of:
have been added. Unless other files have to be added later to the list
of disallowed filenames or there needs to be a more specific check in
mkiocccentry for filenames of the required files this should complete
the disallowed and required filenames checks.