Resolve conflict in run.sh during cherry-pick from an experimental branch.
(cherry picked from commit 2a435708e4)
(cherry picked from commit c5aa6ed87b)
(cherry picked from commit 9bdb4d67f1)
Resolve conflict in run.sh during cherry-pick from experimental branch.
(cherry picked from commit 278c72fef6)
(cherry picked from commit b8e866d60f)
(cherry picked from commit ff56ecafc4)
During the "check flushtree clears adb correctly" check, expecting
"ns.flushtest.example" to always be the first name in the ADB dump is
fragile, because in a certain corner case "a.root-servers.nil" will be
the first name instead.
As the purpose of the relevant check is to ensure "ns.flushtest.example"
is removed from ADB by "rndc flushtree flushtest.example", search the
entire list of names present in ADB instead of just the first entry when
looking for "ns.flushtest.example".
(cherry picked from commit ca1049b2f3)
(cherry picked from commit 3513a585e3)
Dumping the cache is an asynchronous operation, so sleeping for a fixed
amount of time after running "rndc dumpdb" is imperfect as dumping cache
contents may take longer than expected on slower machines. Instead of
always sleeping for 1 second, wait until the "; Dump complete" line
appears in the dump or 10 seconds pass, whichever comes first.
(cherry picked from commit 2bbff06d36)
(cherry picked from commit e617b91527)
Unless configured otherwise in named.conf, "rndc dumpdb" causes a cache
dump to be written to a file called "named_dump.db" in the working
directory of the given named instance. Repeatedly using this command
throughout different checks in the cacheclean system test causes cache
dumps for older checks to be overwritten, which hinders failure
diagnosis. Prevent this by moving each cache dump to a check-specific
location after running "rndc dumpdb".
Furthermore, during the "check flushtree clears adb correctly" check,
dump_cache() is called twice without renaming the resulting files.
Prevent the first cache dump from being overwritten by moving it to a
different file before calling "rndc dumpdb" for the second time.
(cherry picked from commit aeea1faf01)
(cherry picked from commit dcd91ab322)
This will enable storing per-check forensic data, which facilitates
troubleshooting test failures.
(cherry picked from commit 01de79b332)
(cherry picked from commit 7679819e15)
Ondřej SurýandEvan Hunt
Mark Andrews
Michał KępieńandMark Andrews