[2158] updated the lettuce test suite

- introduced the b10-stats daemon running in the lettuce test suite "Xfrin
  incoming notify handling"
- renamed retransfer_master.conf to retransfer_master.conf.orig because of the
  config change in the lettuce suite

diff --git a/tests/lettuce/configurations/xfrin/.gitignore b/tests/lettuce/configurations/xfrin/.gitignore
new file mode 100644 (file)
index 0000000..4de8c4b
--- /dev/null
+++ b/tests/lettuce/configurations/xfrin/.gitignore
@@ -0,0 +1 @@
+/retransfer_master.conf

diff --git a/tests/lettuce/configurations/xfrin/retransfer_master.conf b/tests/lettuce/configurations/xfrin/retransfer_master.conf.orig
similarity index 93%
rename from tests/lettuce/configurations/xfrin/retransfer_master.conf
rename to tests/lettuce/configurations/xfrin/retransfer_master.conf.orig
index dd29ac893e7fb26979a653db3ff06b68ef3fc92d..b0e3ac0b88f43214a9366ba10cea080df0c77712 100644 (file)
--- a/tests/lettuce/configurations/xfrin/retransfer_master.conf
+++ b/tests/lettuce/configurations/xfrin/retransfer_master.conf.orig
@@ -38,6 +38,7 @@
             "b10-auth": { "kind": "needed", "special": "auth" },
             "b10-xfrout": { "address": "Xfrout", "kind": "dispensable" },
             "b10-zonemgr": { "address": "Zonemgr", "kind": "dispensable" },
+            "b10-stats": { "address": "Stats", "kind": "dispensable" },
             "b10-cmdctl": { "special": "cmdctl", "kind": "needed" }
         }
     }

diff --git a/tests/lettuce/features/terrain/terrain.py b/tests/lettuce/features/terrain/terrain.py
index 876e7cfd48cac8aff2e9d5a9924dfc8e99c0df99..8720e2d99441ffab006bb90bbd2fa16aceaf038f 100644 (file)
--- a/tests/lettuce/features/terrain/terrain.py
+++ b/tests/lettuce/features/terrain/terrain.py
@@ -57,6 +57,8 @@ copylist = [
      "configurations/ddns/ddns.config"],
     ["configurations/ddns/noddns.config.orig",
      "configurations/ddns/noddns.config"],
+    ["configurations/xfrin/retransfer_master.conf.orig",
+     "configurations/xfrin/retransfer_master.conf"],
     ["data/inmem-xfrin.sqlite3.orig",
      "data/inmem-xfrin.sqlite3"],
     ["data/xfrin-notify.sqlite3.orig",