BIND 10 trac2937, updated. c8d00f7c62ecf19879d70e6dcfdc0ab14551b6c9 [2937] Minor tweaks
BIND 10 source code commits
bind10-changes at lists.isc.org
Mon May 20 11:14:09 UTC 2013
The branch, trac2937 has been updated
via c8d00f7c62ecf19879d70e6dcfdc0ab14551b6c9 (commit)
from 76b4abce83b333c61b596df651dfc2f9e3d72100 (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 c8d00f7c62ecf19879d70e6dcfdc0ab14551b6c9
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Mon May 20 13:13:33 2013 +0200
[2937] Minor tweaks
Comments, unused values, etc.
-----------------------------------------------------------------------
Summary of changes:
src/bin/usermgr/tests/b10-cmdctl-usermgr_test.py | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/usermgr/tests/b10-cmdctl-usermgr_test.py b/src/bin/usermgr/tests/b10-cmdctl-usermgr_test.py
index 09d3fd58..0766b7c 100644
--- a/src/bin/usermgr/tests/b10-cmdctl-usermgr_test.py
+++ b/src/bin/usermgr/tests/b10-cmdctl-usermgr_test.py
@@ -133,6 +133,8 @@ class TestUserMgr(unittest.TestCase):
May be None, in which case the check is skipped.
expected_stderr, (multiline) string that is checked against stderr.
May be None, in which case the check is skipped.
+
+ Returns the standard output and error captured to a string.
"""
(returncode, stdout, stderr) = run(command)
if expected_stderr is not None:
@@ -140,7 +142,7 @@ class TestUserMgr(unittest.TestCase):
if expected_stdout is not None:
self.assertEqual(expected_stdout, stdout.decode())
self.assertEqual(expected_returncode, returncode, " ".join(command))
- return (returncode, stdout.decode(), stderr.decode())
+ return (stdout.decode(), stderr.decode())
def test_help(self):
self.run_check(0,
@@ -473,12 +475,15 @@ Options:
# So we need to check the output in a little more complex way.
# We ask the run_check not to check the output and check it
# ourselves.
- (returncode, stdout, stderr) = self.run_check(2, None,
+ (stdout, stderr) = self.run_check(2, None,
'',
[ self.TOOL,
'-f', self.OUTPUT_FILE,
'add', 'user1', 'pass1'
])
+ # This looks little bit awkward, but is probably easiest with
+ # just 2 known possibilities. If there are more, we'll have to
+ # think of something else.
self.assertTrue(stdout ==
'Using accounts file: test_users.csv\n'
'Error parsing csv file: newline inside string\n' or
More information about the bind10-changes
mailing list