BIND 10 master, updated. 2fbb93f713ace228c5d73fc38e2b3c53eb8cea1d [master] Disable lettuce tests for resolver when the resolver is not available
BIND 10 source code commits
bind10-changes at lists.isc.org
Wed Aug 14 12:51:52 UTC 2013
The branch, master has been updated
via 2fbb93f713ace228c5d73fc38e2b3c53eb8cea1d (commit)
from 95e7d858ada42f6180d677d176b79b3b91219376 (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 2fbb93f713ace228c5d73fc38e2b3c53eb8cea1d
Author: Mukund Sivaraman <muks at isc.org>
Date: Wed Aug 14 16:04:41 2013 +0530
[master] Disable lettuce tests for resolver when the resolver is not available
Also fix configure argument name to match help documentation.
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 10 ++++++++--
tests/lettuce/features/.gitignore | 1 +
...sic.feature => resolver_basic.feature.disabled} | 0
tests/lettuce/setup_intree_bind10.sh.in | 5 +++++
4 files changed, 14 insertions(+), 2 deletions(-)
create mode 100644 tests/lettuce/features/.gitignore
rename tests/lettuce/features/{resolver_basic.feature => resolver_basic.feature.disabled} (100%)
-----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index e153d93..7857fd9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -899,11 +899,17 @@ if test "$BOOST_NUMERIC_CAST_WOULDFAIL" = "yes" -a X"$werror_ok" = X1 -a $CLANGP
fi
build_experimental_resolver=no
-AC_ARG_ENABLE(experimental_resolver,
+AC_ARG_ENABLE(experimental-resolver,
[AC_HELP_STRING([--enable-experimental-resolver],
[enable building of the experimental resolver [default=no]])],
- build_experimental_resolver=$enableval, build_experimental_resolver=no)
+ [build_experimental_resolver=$enableval])
AM_CONDITIONAL([BUILD_EXPERIMENTAL_RESOLVER], [test "$build_experimental_resolver" = "yes"])
+if test "$build_experimental_resolver" = "yes"; then
+ BUILD_EXPERIMENTAL_RESOLVER=yes
+else
+ BUILD_EXPERIMENTAL_RESOLVER=no
+fi
+AC_SUBST(BUILD_EXPERIMENTAL_RESOLVER)
use_shared_memory=yes
AC_ARG_WITH(shared-memory,
diff --git a/tests/lettuce/features/.gitignore b/tests/lettuce/features/.gitignore
new file mode 100644
index 0000000..0634dc7
--- /dev/null
+++ b/tests/lettuce/features/.gitignore
@@ -0,0 +1 @@
+/resolver_basic.feature
diff --git a/tests/lettuce/features/resolver_basic.feature b/tests/lettuce/features/resolver_basic.feature
deleted file mode 100644
index 341c14c..0000000
--- a/tests/lettuce/features/resolver_basic.feature
+++ /dev/null
@@ -1,36 +0,0 @@
-Feature: Basic Resolver
- This feature set is just testing the execution of the b10-resolver
- module. It sees whether it starts up, takes configuration, and
- answers queries.
-
- Scenario: Listen for and answer query
- # This scenario starts a server that runs a real resolver.
- # In order not to send out queries into the wild, we only
- # query for something known to be hardcoded at this moment.
- # NOTE: once real priming has been implemented, this test needs
- # to be revised (as it would then leak, which is probably true
- # for any resolver system test)
- When I start bind10 with configuration resolver/resolver_basic.config
- And wait for bind10 stderr message BIND10_STARTED_CC
- And wait for bind10 stderr message CMDCTL_STARTED
- And wait for bind10 stderr message RESOLVER_STARTED
-
- bind10 module Resolver should be running
- And bind10 module Auth should not be running
- And bind10 module Xfrout should not be running
- And bind10 module Zonemgr should not be running
- And bind10 module Xfrin should not be running
- And bind10 module Stats should not be running
- And bind10 module StatsHttpd should not be running
-
- # The ACL is set to reject any queries
- A recursive query for l.root-servers.net. should have rcode REFUSED
-
- # Test whether acl ACCEPT works
- When I set bind10 configuration Resolver/query_acl[0] to {"action": "ACCEPT", "from": "127.0.0.1"}
- # This address is currently hardcoded, so shouldn't cause outside traffic
- A recursive query for l.root-servers.net. should have rcode NOERROR
-
- # Check whether setting the ACL to reject again works
- When I set bind10 configuration Resolver/query_acl[0] to {"action": "REJECT", "from": "127.0.0.1"}
- A recursive query for l.root-servers.net. should have rcode REFUSED
diff --git a/tests/lettuce/features/resolver_basic.feature.disabled b/tests/lettuce/features/resolver_basic.feature.disabled
new file mode 100644
index 0000000..341c14c
--- /dev/null
+++ b/tests/lettuce/features/resolver_basic.feature.disabled
@@ -0,0 +1,36 @@
+Feature: Basic Resolver
+ This feature set is just testing the execution of the b10-resolver
+ module. It sees whether it starts up, takes configuration, and
+ answers queries.
+
+ Scenario: Listen for and answer query
+ # This scenario starts a server that runs a real resolver.
+ # In order not to send out queries into the wild, we only
+ # query for something known to be hardcoded at this moment.
+ # NOTE: once real priming has been implemented, this test needs
+ # to be revised (as it would then leak, which is probably true
+ # for any resolver system test)
+ When I start bind10 with configuration resolver/resolver_basic.config
+ And wait for bind10 stderr message BIND10_STARTED_CC
+ And wait for bind10 stderr message CMDCTL_STARTED
+ And wait for bind10 stderr message RESOLVER_STARTED
+
+ bind10 module Resolver should be running
+ And bind10 module Auth should not be running
+ And bind10 module Xfrout should not be running
+ And bind10 module Zonemgr should not be running
+ And bind10 module Xfrin should not be running
+ And bind10 module Stats should not be running
+ And bind10 module StatsHttpd should not be running
+
+ # The ACL is set to reject any queries
+ A recursive query for l.root-servers.net. should have rcode REFUSED
+
+ # Test whether acl ACCEPT works
+ When I set bind10 configuration Resolver/query_acl[0] to {"action": "ACCEPT", "from": "127.0.0.1"}
+ # This address is currently hardcoded, so shouldn't cause outside traffic
+ A recursive query for l.root-servers.net. should have rcode NOERROR
+
+ # Check whether setting the ACL to reject again works
+ When I set bind10 configuration Resolver/query_acl[0] to {"action": "REJECT", "from": "127.0.0.1"}
+ A recursive query for l.root-servers.net. should have rcode REFUSED
diff --git a/tests/lettuce/setup_intree_bind10.sh.in b/tests/lettuce/setup_intree_bind10.sh.in
index ffe0434..600f5c4 100755
--- a/tests/lettuce/setup_intree_bind10.sh.in
+++ b/tests/lettuce/setup_intree_bind10.sh.in
@@ -34,6 +34,11 @@ if test $SET_ENV_LIBRARY_PATH = yes; then
export @ENV_LIBRARY_PATH@
fi
+BUILD_EXPERIMENTAL_RESOLVER=@BUILD_EXPERIMENTAL_RESOLVER@
+if test $BUILD_EXPERIMENTAL_RESOLVER = yes; then
+ cp -f @srcdir@/features/resolver_basic.feature.disabled @srcdir@/features/resolver_basic.feature
+fi
+
B10_FROM_SOURCE=@abs_top_srcdir@
export B10_FROM_SOURCE
# TODO: We need to do this feature based (ie. no general from_source)
More information about the bind10-changes
mailing list