BIND 10 trac1290, updated. 6bdd521c49d10867b63158837f6fdc6d06d1f256 [1290] small update to README

[BIND 10 source code commits]

The branch, trac1290 has been updated
       via  6bdd521c49d10867b63158837f6fdc6d06d1f256 (commit)
       via  c88718438ee67b52cfea003b9e3ce1e5fe234bd8 (commit)
      from  dd7fb442ed97cc469db4275fdc3d4628cd44ea79 (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 6bdd521c49d10867b63158837f6fdc6d06d1f256
Author: Jelte Jansen <jelte at isc.org>
Date:   Wed Oct 19 16:14:24 2011 +0200

    [1290] small update to README

commit c88718438ee67b52cfea003b9e3ce1e5fe234bd8
Author: Jelte Jansen <jelte at isc.org>
Date:   Wed Oct 19 14:20:41 2011 +0200

    [1290] check bindctl exit code, fix setup script

-----------------------------------------------------------------------

Summary of changes:
 tests/lettuce/README                     |    7 +++++--
 tests/lettuce/features/bind10_control.py |    3 ++-
 tests/lettuce/setup_intree_bind10.sh.in  |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

-----------------------------------------------------------------------
diff --git a/tests/lettuce/README b/tests/lettuce/README
index 3db523b..3343329 100644
--- a/tests/lettuce/README
+++ b/tests/lettuce/README
@@ -14,12 +14,15 @@ To install lettuce, if you have the python pip installation tool, simply do
 pip install lettuce
 See http://lettuce.it/intro/install.html
 
-At this moment, we have a fixed port for local tests in our setups, port 47806.
-This port must be free. (TODO: can we make this run-time discovered?)
+Most systems have the pip tool in a separate package; on Debian-based systems
+it is called python-pip. On FreeBSD the port is devel/py-pip.
 
 Running the tests
 -----------------
 
+At this moment, we have a fixed port for local tests in our setups, port 47806.
+This port must be free. (TODO: can we make this run-time discovered?)
+
 To run the tests, just run 'lettuce' in this directory.
 
 We have provided a script that sets up the shell environment to run the tests
diff --git a/tests/lettuce/features/bind10_control.py b/tests/lettuce/features/bind10_control.py
index 2a85e4d..e86d8f7 100644
--- a/tests/lettuce/features/bind10_control.py
+++ b/tests/lettuce/features/bind10_control.py
@@ -60,6 +60,7 @@ def set_config_command(step, name, value):
     bindctl.stdin.write("config set " + name + " " + value + "\n")
     bindctl.stdin.write("config commit\n")
     bindctl.stdin.write("quit\n")
-    bindctl.wait()
+    result = bindctl.wait()
+    assert result == 0, "bindctl exit code: " + str(result)
 
 
diff --git a/tests/lettuce/setup_intree_bind10.sh.in b/tests/lettuce/setup_intree_bind10.sh.in
index 96db61a..40fd82d 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/dhcp6:@abs_top_builddir@/src/bin/sockcreator:$PATH
 export PATH
 
-PYTHONPATH=@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
 export PYTHONPATH
 
 # If necessary (rare cases), explicitly specify paths to dynamic libraries