BIND 10 trac610, updated. 86d0ba9023b4f4a23cf203d3c9bf7c2f3668315e [trac610] Typos

[BIND 10 source code commits]

The branch, trac610 has been updated
       via  86d0ba9023b4f4a23cf203d3c9bf7c2f3668315e (commit)
       via  1ac4ea1a6996dd39d15d4f6cbdf0a766e8d8d569 (commit)
      from  bf8ba76aed284a9f1907b3edde1f546c9a4c0a3c (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 86d0ba9023b4f4a23cf203d3c9bf7c2f3668315e
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Wed Mar 9 11:02:40 2011 +0100

    [trac610] Typos

commit 1ac4ea1a6996dd39d15d4f6cbdf0a766e8d8d569
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Wed Mar 9 11:01:08 2011 +0100

    [trac610] Newlines fix
    
    The '\n' is not expanded here, which leads to sending it verbatim to
    bindctl. Replaced with real newlines.

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

Summary of changes:
 src/bin/bindctl/tests/bindctl_test.py |    2 +-
 tests/system/bindctl/clean.sh         |    4 ----
 tests/system/bindctl/tests.sh         |   24 ++++++++++++++++++------
 3 files changed, 19 insertions(+), 11 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/bindctl/tests/bindctl_test.py b/src/bin/bindctl/tests/bindctl_test.py
index 9bb0cf7..fa58133 100644
--- a/src/bin/bindctl/tests/bindctl_test.py
+++ b/src/bin/bindctl/tests/bindctl_test.py
@@ -346,7 +346,7 @@ class TestBindCmdInterpreter(unittest.TestCase):
 
     def test_csv_file_dir(self):
         # Checking default value
-        if "HOMEE" in os.environ:
+        if "HOME" in os.environ:
             home_dir = os.environ["HOME"]
         else:
             home_dir = pwd.getpwnam(getpass.getuser()).pw_dir
diff --git a/tests/system/bindctl/clean.sh b/tests/system/bindctl/clean.sh
index 30d6888..f691512 100755
--- a/tests/system/bindctl/clean.sh
+++ b/tests/system/bindctl/clean.sh
@@ -15,10 +15,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-#
-# Clean up after glue tests.
-#
-
 rm -f */b10-config.db
 rm -f dig.out.* bindctl.out.*
 rm -f */msgq_socket */zone.sqlite3
diff --git a/tests/system/bindctl/tests.sh b/tests/system/bindctl/tests.sh
index 689c5b8..354f349 100755
--- a/tests/system/bindctl/tests.sh
+++ b/tests/system/bindctl/tests.sh
@@ -35,7 +35,8 @@ echo "I:Checking BIND 10 statistics after a pose ($n)"
 # wait for 2sec to make sure b10-stats gets the latest statistics.
 # note that we set statistics-interval to 1.
 sleep 2
-echo 'Stats show\n' | $RUN_BINDCTL \
+echo 'Stats show
+' | $RUN_BINDCTL \
 	--csv-file-dir=$BINDCTL_CSV_DIR > bindctl.out.$n || status=1
 # the server should have received 1 UDP and 1 TCP queries (TCP query was
 # sent from the server startup script)
@@ -45,7 +46,10 @@ if [ $status != 0 ]; then echo "I:failed"; fi
 n=`expr $n + 1`
 
 echo "I:Stopping b10-auth and checking that ($n)"
-echo 'config set Boss/start_auth false\nconfig commit\nquit\n' | $RUN_BINDCTL \
+echo 'config set Boss/start_auth false
+config commit
+quit
+' | $RUN_BINDCTL \
 	--csv-file-dir=$BINDCTL_CSV_DIR 2>&1 > /dev/null || status=1
 # dig should exit with a failure code.
 $DIG +tcp +norec @10.53.0.1 -p 53210 ns.example.com. A && status=1
@@ -53,7 +57,10 @@ if [ $status != 0 ]; then echo "I:failed"; fi
 n=`expr $n + 1`
 
 echo "I:Restarting b10-auth and checking that ($n)"
-echo 'config set Boss/start_auth true\nconfig commit\nquit\n' | $RUN_BINDCTL \
+echo 'config set Boss/start_auth true
+config commit
+quit
+' | $RUN_BINDCTL \
 	--csv-file-dir=$BINDCTL_CSV_DIR 2>&1 > /dev/null || status=1
 $DIG +norec @10.53.0.1 -p 53210 ns.example.com. A >dig.out.$n || status=1
 grep 192.0.2.1 dig.out.$n > /dev/null || status=1
@@ -62,7 +69,8 @@ n=`expr $n + 1`
 
 echo "I:Rechecking BIND 10 statistics after a pose ($n)"
 sleep 2
-echo 'Stats show\n' | $RUN_BINDCTL \
+echo 'Stats show
+' | $RUN_BINDCTL \
 	--csv-file-dir=$BINDCTL_CSV_DIR > bindctl.out.$n || status=1
 # The statistics counters should have been reset while stop/start.
 grep "\"auth.queries.tcp\": 0," bindctl.out.$n > /dev/null || status=1
@@ -73,7 +81,10 @@ n=`expr $n + 1`
 echo "I:Changing the data source from sqlite3 to in-memory ($n)"
 DATASRC_SPEC='[{"type": "memory", "zones": [{"origin": "com","file":'
 DATASRC_SPEC="${DATASRC_SPEC} \"${TEST_TOP}/bindctl/nsx1/example-normalized.db\"}]}]"
-echo "config set Auth/datasources ${DATASRC_SPEC}\nconfig commit\nquit\n" | $RUN_BINDCTL \
+echo "config set Auth/datasources ${DATASRC_SPEC}
+config commit
+quit
+" | $RUN_BINDCTL \
 	--csv-file-dir=$BINDCTL_CSV_DIR > bindctl.out.$n || status=1
 $DIG +norec @10.53.0.1 -p 53210 ns.example.com. A >dig.out.$n || status=1
 grep 192.0.2.2 dig.out.$n > /dev/null || status=1
@@ -82,7 +93,8 @@ n=`expr $n + 1`
 
 echo "I:Rechecking BIND 10 statistics after changing the datasource ($n)"
 sleep 2
-echo 'Stats show\n' | $RUN_BINDCTL \
+echo 'Stats show
+' | $RUN_BINDCTL \
 	--csv-file-dir=$BINDCTL_CSV_DIR > bindctl.out.$n || status=1
 # The statistics counters shouldn't be reset due to hot-swapping datasource.
 grep "\"auth.queries.tcp\": 0," bindctl.out.$n > /dev/null || status=1