Handle example3.db being modified in upforwd system test

The zone file for example3 (ns1/example3.db) can be modified in the
upforwd test as example3 is updated as part of the test.  Whether
the zone is written out or not by the end of the test is timing
dependent.  Rename ns1/example3.db to ns1/example3.db.in and copy
it to ns1/example3.db in setup so we don't trigger post test changes
checks.

diff --git a/bin/tests/system/upforwd/ns1/example3.db b/bin/tests/system/upforwd/ns1/example3.db.in
similarity index 100%
rename from bin/tests/system/upforwd/ns1/example3.db
rename to bin/tests/system/upforwd/ns1/example3.db.in

diff --git a/bin/tests/system/upforwd/setup.sh b/bin/tests/system/upforwd/setup.sh
index 7fddf0175c887b5e151660d659e65bc0dea694d1..8e9da74ae88b65898c803180ee7b73ae211ea390 100644 (file)
--- a/bin/tests/system/upforwd/setup.sh
+++ b/bin/tests/system/upforwd/setup.sh
@@ -14,6 +14,7 @@
 . ../conf.sh
 
 cp -f ns1/example1.db ns1/example.db
+cp -f ns1/example3.db.in ns1/example3.db
 cp -f ns3/noprimary.db ns3/noprimary1.db
 
 copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/upforwd/tests_sh_upforwd.py b/bin/tests/system/upforwd/tests_sh_upforwd.py
index 7479f9753ddd4eeeed6bfc0391400773e664d743..3dfa290a3161ad43addc2d34dc4a63878cfa1511 100644 (file)
--- a/bin/tests/system/upforwd/tests_sh_upforwd.py
+++ b/bin/tests/system/upforwd/tests_sh_upforwd.py
@@ -26,6 +26,7 @@ pytestmark = pytest.mark.extra_artifacts(
         "ns1/example.db",
         "ns1/example2-toomanykeys.db",
         "ns1/example2.db",
+        "ns1/example3.db",
         "ns3/dnstap.conf",
         "ns3/dnstap.out",
         "ns3/noprimary1.db",