BIND 10 trac1818, updated. c08f84fa36ab76e0eb24e952554ff8dc7fa56bd1 [1818] Don't check for auth when starting bind10 in lettuce tests
BIND 10 source code commits
bind10-changes at lists.isc.org
Wed Apr 4 07:26:15 UTC 2012
The branch, trac1818 has been updated
via c08f84fa36ab76e0eb24e952554ff8dc7fa56bd1 (commit)
via 5cb72ce87b1288a7e1377bddd4635d084c88e223 (commit)
via f76ec98f548fa945956763c2757318a85f17a117 (commit)
via 0c1b03c6edb14b892a79f888e7c4a5e3931bd84b (commit)
from 899b308a52dd8fa5027adac3bf72b1f1e4927221 (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 c08f84fa36ab76e0eb24e952554ff8dc7fa56bd1
Author: Mukund Sivaraman <muks at isc.org>
Date: Wed Apr 4 12:55:57 2012 +0530
[1818] Don't check for auth when starting bind10 in lettuce tests
commit 5cb72ce87b1288a7e1377bddd4635d084c88e223
Author: Mukund Sivaraman <muks at isc.org>
Date: Wed Apr 4 12:55:31 2012 +0530
[1818] Prepend to PYTHONPATH, don't replace it
commit f76ec98f548fa945956763c2757318a85f17a117
Author: Mukund Sivaraman <muks at isc.org>
Date: Wed Apr 4 12:55:15 2012 +0530
[1818] Add lettuce test for the default configuration of bind10
commit 0c1b03c6edb14b892a79f888e7c4a5e3931bd84b
Author: Mukund Sivaraman <muks at isc.org>
Date: Wed Apr 4 12:32:40 2012 +0530
[1818] Fix zones sqlite3 filename
-----------------------------------------------------------------------
Summary of changes:
tests/lettuce/configurations/default.config | 10 ++++++++++
.../configurations/ixfr-out/testset1-config.db | 2 +-
tests/lettuce/features/default.feature | 15 +++++++++++++++
tests/lettuce/features/terrain/bind10_control.py | 5 +----
tests/lettuce/setup_intree_bind10.sh.in | 2 +-
5 files changed, 28 insertions(+), 6 deletions(-)
create mode 100644 tests/lettuce/configurations/default.config
create mode 100644 tests/lettuce/features/default.feature
-----------------------------------------------------------------------
diff --git a/tests/lettuce/configurations/default.config b/tests/lettuce/configurations/default.config
new file mode 100644
index 0000000..61f0f64
--- /dev/null
+++ b/tests/lettuce/configurations/default.config
@@ -0,0 +1,10 @@
+{
+ "version": 2,
+ "Logging": {
+ "loggers": [ {
+ "debuglevel": 99,
+ "severity": "DEBUG",
+ "name": "auth"
+ } ]
+ }
+}
diff --git a/tests/lettuce/configurations/ixfr-out/testset1-config.db b/tests/lettuce/configurations/ixfr-out/testset1-config.db
index c5fc165..ba4c215 100644
--- a/tests/lettuce/configurations/ixfr-out/testset1-config.db
+++ b/tests/lettuce/configurations/ixfr-out/testset1-config.db
@@ -1 +1 @@
-{"Xfrin": {"zones": [{"use_ixfr": true, "class": "IN", "name": "example.com.", "master_addr": "178.18.82.80"}]}, "version": 2, "Logging": {"loggers": [{"debuglevel": 99, "severity": "DEBUG", "output_options": [{"output": "stderr", "flush": true}], "name": "*"}]}, "Auth": {"database_file": "data/ixfr-out/zones.slite3", "listen_on": [{"port": 47806, "address": "::"}, {"port": 47806, "address": "0.0.0.0"}]}}
+{"Xfrin": {"zones": [{"use_ixfr": true, "class": "IN", "name": "example.com.", "master_addr": "178.18.82.80"}]}, "version": 2, "Logging": {"loggers": [{"debuglevel": 99, "severity": "DEBUG", "output_options": [{"output": "stderr", "flush": true}], "name": "*"}]}, "Auth": {"database_file": "data/ixfr-out/zones.sqlite3", "listen_on": [{"port": 47806, "address": "::"}, {"port": 47806, "address": "0.0.0.0"}]}}
diff --git a/tests/lettuce/features/default.feature b/tests/lettuce/features/default.feature
new file mode 100644
index 0000000..d3115e6
--- /dev/null
+++ b/tests/lettuce/features/default.feature
@@ -0,0 +1,15 @@
+Feature: default bind10 config
+ Tests for the default configuration of bind10.
+
+ Scenario: Check that only the default components are running
+ Given I have bind10 running with configuration default.config
+
+ bind10 module Boss should be running
+ bind10 module Logging should be running
+ bind10 module Stats should be running
+ bind10 module StatsHttpd should be running
+ bind10 module Resolver should not be running
+ bind10 module Xfrout should not be running
+ bind10 module Zonemgr should not be running
+ bind10 module Xfrin should not be running
+ bind10 module Auth should not be running
diff --git a/tests/lettuce/features/terrain/bind10_control.py b/tests/lettuce/features/terrain/bind10_control.py
index b2a367c..7112440 100644
--- a/tests/lettuce/features/terrain/bind10_control.py
+++ b/tests/lettuce/features/terrain/bind10_control.py
@@ -100,18 +100,15 @@ def wait_for_xfrout(step, process_name):
def have_bind10_running(step, config_file, cmdctl_port, process_name):
"""
Compound convenience step for running bind10, which consists of
- start_bind10 and wait_for_auth.
+ start_bind10.
Currently only supports the 'with configuration' option.
"""
start_step = 'start bind10 with configuration ' + config_file
- wait_step = 'wait for bind10 auth to start'
if cmdctl_port is not None:
start_step += ' with cmdctl port ' + str(cmdctl_port)
if process_name is not None:
start_step += ' as ' + process_name
- wait_step = 'wait for bind10 auth of ' + process_name + ' to start'
step.given(start_step)
- step.given(wait_step)
# function to send lines to bindctl, and store the result
def run_bindctl(commands, cmdctl_port=None):
diff --git a/tests/lettuce/setup_intree_bind10.sh.in b/tests/lettuce/setup_intree_bind10.sh.in
index b1f17bc..9d72778 100755
--- a/tests/lettuce/setup_intree_bind10.sh.in
+++ b/tests/lettuce/setup_intree_bind10.sh.in
@@ -23,7 +23,7 @@ BIND10_PATH=@abs_top_builddir@/src/bin/bind10
PATH=@abs_top_builddir@/src/bin/bind10:@abs_top_builddir@/src/bin/bindctl:@abs_top_builddir@/src/bin/msgq:@abs_top_builddir@/src/bin/auth:@abs_top_builddir@/src/bin/resolver:@abs_top_builddir@/src/bin/cfgmgr:@abs_top_builddir@/src/bin/cmdctl:@abs_top_builddir@/src/bin/stats:@abs_top_builddir@/src/bin/xfrin:@abs_top_builddir@/src/bin/xfrout:@abs_top_builddir@/src/bin/zonemgr:@abs_top_builddir@/src/bin/ddns:@abs_top_builddir@/src/bin/dhcp6:@abs_top_builddir@/src/bin/sockcreator:$PATH
export PATH
-PYTHONPATH=@abs_top_builddir@/src/bin:@abs_top_builddir@/src/lib/python/isc/log_messages:@abs_top_builddir@/src/lib/python:@abs_top_builddir@/src/lib/dns/python/.libs:@abs_top_builddir@/src/lib/xfr/.libs:@abs_top_builddir@/src/lib/log/.libs:@abs_top_builddir@/src/lib/util/io/.libs:@abs_top_builddir@/src/lib/python/isc/config:@abs_top_builddir@/src/lib/python/isc/acl/.libs:@abs_top_builddir@/src/lib/python/isc/datasrc/.libs
+PYTHONPATH=@abs_top_builddir@/src/bin:@abs_top_builddir@/src/lib/python/isc/log_messages:@abs_top_builddir@/src/lib/python:@abs_top_builddir@/src/lib/dns/python/.libs:@abs_top_builddir@/src/lib/xfr/.libs:@abs_top_builddir@/src/lib/log/.libs:@abs_top_builddir@/src/lib/util/io/.libs:@abs_top_builddir@/src/lib/python/isc/config:@abs_top_builddir@/src/lib/python/isc/acl/.libs:@abs_top_builddir@/src/lib/python/isc/datasrc/.libs:$PYTHONPATH
export PYTHONPATH
# If necessary (rare cases), explicitly specify paths to dynamic libraries
More information about the bind10-changes
mailing list