BIND 10 trac1976-cont-3, updated. 9a7b53ca18ede76274bab50c3bd45c248cd65c52 [1976] More lettuce tests' configuration updates
BIND 10 source code commits
bind10-changes at lists.isc.org
Fri Jul 13 09:48:28 UTC 2012
The branch, trac1976-cont-3 has been updated
via 9a7b53ca18ede76274bab50c3bd45c248cd65c52 (commit)
from 78d6dcd302295dc106b6cb6de2c995b724f9f05f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9a7b53ca18ede76274bab50c3bd45c248cd65c52
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Fri Jul 13 11:38:29 2012 +0200
[1976] More lettuce tests' configuration updates
-----------------------------------------------------------------------
Summary of changes:
tests/lettuce/configurations/ddns/ddns.config.orig | 12 ++++++++
.../lettuce/configurations/ddns/noddns.config.orig | 29 +++++++++++---------
.../lettuce/configurations/example.org.config.orig | 12 ++++++++
.../configurations/example.org.inmem.config | 29 +++++++++++++++++++-
tests/lettuce/configurations/example2.org.config | 12 ++++++++
.../inmemory_over_sqlite3/secondary.conf | 24 ++++++++++------
tests/lettuce/configurations/no_db_file.config | 12 ++++++++
.../lettuce/configurations/xfrin/inmem_slave.conf | 25 +++++++++++------
8 files changed, 124 insertions(+), 31 deletions(-)
-----------------------------------------------------------------------
diff --git a/tests/lettuce/configurations/ddns/ddns.config.orig b/tests/lettuce/configurations/ddns/ddns.config.orig
index 80b92f7..93e7c1c 100644
--- a/tests/lettuce/configurations/ddns/ddns.config.orig
+++ b/tests/lettuce/configurations/ddns/ddns.config.orig
@@ -27,6 +27,18 @@
}
]
},
+ "data_sources": {
+ "classes": {
+ "IN": [
+ {
+ "type": "sqlite3",
+ "params": {
+ "database_file": "data/ddns/example.org.sqlite3"
+ }
+ }
+ ]
+ }
+ },
"Boss": {
"components": {
"b10-xfrout": {
diff --git a/tests/lettuce/configurations/ddns/noddns.config.orig b/tests/lettuce/configurations/ddns/noddns.config.orig
index bf89537..7a9a947 100644
--- a/tests/lettuce/configurations/ddns/noddns.config.orig
+++ b/tests/lettuce/configurations/ddns/noddns.config.orig
@@ -17,21 +17,24 @@
"port": 47806,
"address": "127.0.0.1"
}
- ],
- "datasources": [
- {
- "type": "memory",
- "class": "IN",
- "zones": [
- {
- "origin": "example.org",
- "filetype": "sqlite3",
- "file": "data/ddns/example.org.sqlite3"
- }
- ]
- }
]
},
+ "data_sources": {
+ "classes": {
+ "IN": [
+ {
+ "type": "sqlite3",
+ "params": {
+ "database_file": "data/ddns/example.org.sqlite3"
+ },
+ "cache-enable": true,
+ "cache-zones": [
+ "example.org"
+ ]
+ }
+ ]
+ }
+ },
"Boss": {
"components": {
"b10-xfrout": {"kind": "dispensable"},
diff --git a/tests/lettuce/configurations/example.org.config.orig b/tests/lettuce/configurations/example.org.config.orig
index fadb3e2..c5545ed 100644
--- a/tests/lettuce/configurations/example.org.config.orig
+++ b/tests/lettuce/configurations/example.org.config.orig
@@ -14,6 +14,18 @@
"address": "127.0.0.1"
} ]
},
+ "data_sources": {
+ "classes": {
+ "IN": [
+ {
+ "type": "sqlite3",
+ "params": {
+ "database_file": "data/example.org.sqlite3"
+ }
+ }
+ ]
+ }
+ },
"Boss": {
"components": {
"b10-auth": { "kind": "needed", "special": "auth" },
diff --git a/tests/lettuce/configurations/example.org.inmem.config b/tests/lettuce/configurations/example.org.inmem.config
index 6418c65..7ea34b3 100644
--- a/tests/lettuce/configurations/example.org.inmem.config
+++ b/tests/lettuce/configurations/example.org.inmem.config
@@ -1,4 +1,31 @@
-{"version": 2, "Logging": {"loggers": [{"severity": "DEBUG", "name": "*", "debuglevel": 99}]}, "Auth": {"database_file": "", "listen_on": [{"port": 47806, "address": "127.0.0.1"}], "datasources": [{"zones": [{"origin": "example.org", "file": "data/example.org"}], "type": "memory"}]},
+{
+ "version": 2,
+ "Logging": {
+ "loggers": [{
+ "severity": "DEBUG",
+ "name": "*",
+ "debuglevel": 99
+ }]
+ },
+ "Auth": {
+ "listen_on": [{
+ "port": 47806,
+ "address": "127.0.0.1"
+ }]
+ },
+ "data_sources": {
+ "classes": {
+ "IN": [
+ {
+ "type": "MasterFiles",
+ "cache-enable": true,
+ "params": {
+ "example.org": "data/example.org"
+ }
+ }
+ ]
+ }
+ },
"Boss": {
"components": {
"b10-auth": { "kind": "needed", "special": "auth" },
diff --git a/tests/lettuce/configurations/example2.org.config b/tests/lettuce/configurations/example2.org.config
index 25314dc..eeb9733 100644
--- a/tests/lettuce/configurations/example2.org.config
+++ b/tests/lettuce/configurations/example2.org.config
@@ -15,6 +15,18 @@
"address": "::1"
} ]
},
+ "data_sources": {
+ "classes": {
+ "IN": [
+ {
+ "type": "sqlite3",
+ "params": {
+ "database_file": "data/example.org.sqlite3"
+ }
+ }
+ ]
+ }
+ },
"Boss": {
"components": {
"b10-auth": { "kind": "needed", "special": "auth" },
diff --git a/tests/lettuce/configurations/inmemory_over_sqlite3/secondary.conf b/tests/lettuce/configurations/inmemory_over_sqlite3/secondary.conf
index 8571015..107c53f 100644
--- a/tests/lettuce/configurations/inmemory_over_sqlite3/secondary.conf
+++ b/tests/lettuce/configurations/inmemory_over_sqlite3/secondary.conf
@@ -8,19 +8,27 @@
} ]
},
"Auth": {
- "datasources": [ {
- "type": "memory",
- "zones": [ {
- "origin": "example.org",
- "file": "data/example.org.sqlite3",
- "filetype": "sqlite3"
- } ]
- } ],
"listen_on": [ {
"port": 47806,
"address": "127.0.0.1"
} ]
},
+ "data_sources": {
+ "classes": {
+ "IN": [
+ {
+ "type": "sqlite3",
+ "params": {
+ "database_file": "data/example.org.sqlite3"
+ },
+ "cache-enable": true,
+ "cache-zones": [
+ "example.org"
+ ]
+ }
+ ]
+ }
+ },
"Boss": {
"components": {
"b10-auth": { "kind": "needed", "special": "auth" },
diff --git a/tests/lettuce/configurations/no_db_file.config b/tests/lettuce/configurations/no_db_file.config
index fc0a25d..bc4ff5f 100644
--- a/tests/lettuce/configurations/no_db_file.config
+++ b/tests/lettuce/configurations/no_db_file.config
@@ -15,6 +15,18 @@
"address": "127.0.0.1"
} ]
},
+ "data_sources": {
+ "classes": {
+ "IN": [
+ {
+ "type": "sqlite3",
+ "params": {
+ "database_file": "data/test_nonexistent_db.sqlite3"
+ }
+ }
+ ]
+ }
+ },
"Boss": {
"components": {
"b10-auth": { "kind": "needed", "special": "auth" },
diff --git a/tests/lettuce/configurations/xfrin/inmem_slave.conf b/tests/lettuce/configurations/xfrin/inmem_slave.conf
index a6d88ee..0e735da 100644
--- a/tests/lettuce/configurations/xfrin/inmem_slave.conf
+++ b/tests/lettuce/configurations/xfrin/inmem_slave.conf
@@ -9,20 +9,27 @@
},
"Auth": {
"database_file": "data/inmem-xfrin.sqlite3",
- "datasources": [ {
- "type": "memory",
- "class": "IN",
- "zones": [ {
- "origin": "example.org",
- "file": "data/inmem-xfrin.sqlite3",
- "filetype": "sqlite3"
- } ]
- } ],
"listen_on": [ {
"port": 47806,
"address": "127.0.0.1"
} ]
},
+ "data_sources": {
+ "classes": {
+ "IN": [
+ {
+ "type": "sqlite3",
+ "params": {
+ "database_file": "data/inmem-xfrin.sqlite3"
+ },
+ "cache-enable": true,
+ "cache-zones": [
+ "example.org"
+ ]
+ }
+ ]
+ }
+ },
"Boss": {
"components": {
"b10-auth": { "kind": "needed", "special": "auth" },
More information about the bind10-changes
mailing list