From: Naoki Kambe <kambe@jprs.co.jp>
Date: Fri, 17 Aug 2012 05:33:56 +0000 (+0900)
Subject: [2158] updated the lettuce test suite
X-Git-Tag: trac2351_base~65^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9007b87d062335814cbef0b579003a61d6442e57;p=thirdparty%2Fkea.git

[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
index 0000000000..4de8c4b137
--- /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 dd29ac893e..b0e3ac0b88 100644
--- 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 876e7cfd48..8720e2d994 100644
--- 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",