Repository navigation
fix(pcapng): name the Name Resolution Block in its guard messages (#1038) - #1047
Conversation
19bf0ef to
13a93f2
Compare
) - The six ns_dnsname/ns_dnsIP4addr/ns_dnsIP6addr scope guards (read and make side) check Name_Resolution_Block but said the option must be in the systemd(1) Journal Export Block; they now name the Name Resolution Block, without the literal :manpage: role. - register_record's RegistryWarning now says "name resolution record already registered" instead of "systemd(1) journal export record". - The make-side ns_dnsIP4addr/ns_dnsIP6addr messages and docstrings use the OptionType member spelling instead of ns_dnsip4addr/ns_dnsip6addr. - Tests cover every guard message and the warning; changelog entry and the process.rst entry-count pin (164) updated.
- _make_option_if_rxspeed's scope and duplicate guards said [if_txspeed]; they now say [if_rxspeed]. - _read_option_epb_queue's length guard said [epb_packetid]; it now says [epb_queue]. - NS_DNSIP4AddrOption/NS_DNSIP6AddrOption data-model docstrings use the ns_dnsIP4addr/ns_dnsIP6addr spelling. - Tests cover the three corrected messages; the #1038 changelog entry is extended (entry count unchanged at 164).
3cf9659 to
4f55f49
Compare
|
Cross-review verdict on
Not Nit: the last line of the 1.5.0 entry is not wrapped to the surrounding width. |
Please follow the guide below
You will be asked some questions, please read them carefully and answer honestly
Put an
xinto all the boxes [ ] relevant to your pull request (like that [x])Use Preview tab to see how your pull request will actually look like
Searched for similar pull requests
Followed the coding style (
make pylint,make mypy,make isort) — isort clean onpcapng.py; pylint/mypy not run (string-only source change)make testpasses, and a test case covers the change — tests added;test_pcapng_unit.py,test_option_roundtrip_unit.pyandtests/projectrun locallyAdded a changelog entry under
docs/source/changelog/and regeneratedCHANGELOG.md, if the change is user-visibleWhat is the purpose of your pull request?
Tick the commit type your subject line carries.
fix— corrects a defectfeat— adds a featureperf— changes performance, not behaviourrefactor— changes neither behaviour nor performancetest— tests onlydocs— documentation onlyci— workflows or build toolingchore— anything elseDescription of your pull request and other information
Closes #1038. The six
ns_dns*scope guards inpcapng.py, on both the read and the make side, checkName_Resolution_Blockbut named the systemd(1) Journal Export Block. They now say "must be in Name Resolution Block".register_record'sRegistryWarningnow says "name resolution record already registered". Neither message has a:manpage:role any more.Spelling:
ns_dnsIP4addr/ns_dnsIP6addr. That is theOptionTypemember name and value (const/pcapng/option_type.py:170,173), and the schema docstrings and read-side messages use it too. The make-side messages, the docstrings and the data-model docstrings now match.Second commit, same defect class: I checked every bracketed option name against its own method.
_make_option_if_rxspeed's two guards said[if_txspeed], and_read_option_epb_queue's length guard said[epb_packetid].New tests cover every corrected message, and each one fails on
main. Theprocess.rstchangelog pin is re-measured at 164 after rebasing onto #1046.