BIND 10 master, updated. f53e65cdceeb8e6da4723730e4ed0a17e4646579 [2410] Merge branch 'master' into trac2410
BIND 10 source code commits
bind10-changes at lists.isc.org
Tue Nov 27 10:40:25 UTC 2012
The branch, master has been updated
via f53e65cdceeb8e6da4723730e4ed0a17e4646579 (commit)
via aac0dd304b86ee38049480c8155f5eb97142c435 (commit)
via 56bcca870b41742f47160cae5b30b81ef62c1095 (commit)
via 9f454868d6240a3113bed21cd719293ddb10991f (commit)
from 93f7ca576d5f9f906733775ca9173231de175290 (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 f53e65cdceeb8e6da4723730e4ed0a17e4646579
Merge: aac0dd3 93f7ca5
Author: Stephen Morris <stephen at isc.org>
Date: Tue Nov 27 10:16:03 2012 +0000
[2410] Merge branch 'master' into trac2410
commit aac0dd304b86ee38049480c8155f5eb97142c435
Author: Stephen Morris <stephen at isc.org>
Date: Thu Nov 22 19:22:25 2012 +0000
[2410] Changes as a result of review
commit 56bcca870b41742f47160cae5b30b81ef62c1095
Author: Stephen Morris <stephen at isc.org>
Date: Wed Nov 21 18:18:28 2012 +0000
[2410] Fix race condition in DHCP4 test
Same change as in commit 9f454868d6240a3113bed21cd719293ddb10991f
but applied to the DHCP4 test.
commit 9f454868d6240a3113bed21cd719293ddb10991f
Author: Stephen Morris <stephen at isc.org>
Date: Wed Nov 21 18:03:04 2012 +0000
[2410] Attempt to fix race condition in test
Attempts to fix a process/subprocess race condition by having
the parent process loop waiting for output instead of assuming
that the subprocess has started and has written something by the
time it gets round to reading it.
Also closes a few unclosed file descriptors at the end of a test.
-----------------------------------------------------------------------
Summary of changes:
src/bin/dhcp4/tests/dhcp4_test.py | 81 +++++++++++++++++++++++--------------
src/bin/dhcp6/tests/dhcp6_test.py | 76 +++++++++++++++++++++-------------
2 files changed, 100 insertions(+), 57 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/dhcp4/tests/dhcp4_test.py b/src/bin/dhcp4/tests/dhcp4_test.py
index 444dfcf..e493e04 100644
--- a/src/bin/dhcp4/tests/dhcp4_test.py
+++ b/src/bin/dhcp4/tests/dhcp4_test.py
@@ -45,11 +45,30 @@ class TestDhcpv4Daemon(unittest.TestCase):
def tearDown(self):
pass
+ def readPipe(self, pipe_fd):
+ """
+ Reads bytes from a pipe and returns a character string. If nothing is
+ read, or if there is an error, an empty string is returned.
+
+ pipe_fd - Pipe file descriptor to read
+ """
+ try:
+ data = os.read(pipe_fd, 16384)
+ # Make sure we have a string
+ if (data is None):
+ data = ""
+ else:
+ data = str(data)
+ except OSError:
+ data = ""
+
+ return data
+
def runCommand(self, params, wait=1):
"""
- This method runs dhcp4 and returns a tuple: (returncode, stdout, stderr)
+ This method runs a command and returns a tuple: (returncode, stdout, stderr)
"""
- ## @todo: Convert this into generic method and reuse it in dhcp6
+ ## @todo: Convert this into generic method and reuse it in dhcp4 and dhcp6
print("Running command: %s" % (" ".join(params)))
@@ -89,46 +108,48 @@ class TestDhcpv4Daemon(unittest.TestCase):
fl = fcntl.fcntl(fd, fcntl.F_GETFL)
fcntl.fcntl(fd, fcntl.F_SETFL, fl | os.O_NONBLOCK)
- # There's potential problem if b10-dhcp4 prints out more
- # than 16kB of text
- try:
- output = os.read(self.stdout_pipes[0], 16384)
- except OSError:
- print("No data available from stdout")
- output = ""
-
- # read can return None. Make sure we have a string
- if (output is None):
- output = ""
-
- try:
- error = os.read(self.stderr_pipes[0], 16384)
- except OSError:
- print("No data available on stderr")
- error = ""
-
- # read can return None. Make sure we have a string
- if (error is None):
- error = ""
-
-
- try:
- if (not pi.process.poll()):
- # let's be nice at first...
+ # As we don't know how long the subprocess will take to start and
+ # produce output, we'll loop and sleep for 250 ms between each
+ # iteration. To avoid an infinite loop, we'll loop for a maximum
+ # of five seconds: that should be enough.
+ for count in range(20):
+ # Read something from stderr and stdout (these reads don't block).
+ output = self.readPipe(self.stdout_pipes[0])
+ error = self.readPipe(self.stderr_pipes[0])
+
+ # If the process has already exited, or if it has output something,
+ # quit the loop now.
+ if pi.process.poll() is not None or len(error) > 0 or len(output) > 0:
+ break
+
+ # Process still running, try again in 250 ms.
+ time.sleep(0.25)
+
+ # Exited loop, kill the process if it is still running
+ if pi.process.poll() is None:
+ try:
pi.process.terminate()
- except OSError:
- print("Ignoring failed kill attempt. Process is dead already.")
+ except OSError:
+ print("Ignoring failed kill attempt. Process is dead already.")
# call this to get returncode, process should be dead by now
rc = pi.process.wait()
# Clean up our stdout/stderr munging.
os.dup2(self.stdout_old, sys.stdout.fileno())
+ os.close(self.stdout_old)
os.close(self.stdout_pipes[0])
os.dup2(self.stderr_old, sys.stderr.fileno())
+ os.close(self.stderr_old)
os.close(self.stderr_pipes[0])
+ # Free up resources (file descriptors) from the ProcessInfo object
+ # TODO: For some reason, this gives an error if the process has ended,
+ # although it does cause all descriptors still allocated to the
+ # object to be freed.
+ pi = None
+
print ("Process finished, return code=%d, stdout=%d bytes, stderr=%d bytes"
% (rc, len(output), len(error)) )
diff --git a/src/bin/dhcp6/tests/dhcp6_test.py b/src/bin/dhcp6/tests/dhcp6_test.py
index f3099b9..1870392 100644
--- a/src/bin/dhcp6/tests/dhcp6_test.py
+++ b/src/bin/dhcp6/tests/dhcp6_test.py
@@ -45,6 +45,25 @@ class TestDhcpv6Daemon(unittest.TestCase):
def tearDown(self):
pass
+ def readPipe(self, pipe_fd):
+ """
+ Reads bytes from a pipe and returns a character string. If nothing is
+ read, or if there is an error, an empty string is returned.
+
+ pipe_fd - Pipe file descriptor to read
+ """
+ try:
+ data = os.read(pipe_fd, 16384)
+ # Make sure we have a string
+ if (data is None):
+ data = ""
+ else:
+ data = str(data)
+ except OSError:
+ data = ""
+
+ return data
+
def runCommand(self, params, wait=1):
"""
This method runs a command and returns a tuple: (returncode, stdout, stderr)
@@ -89,45 +108,48 @@ class TestDhcpv6Daemon(unittest.TestCase):
fl = fcntl.fcntl(fd, fcntl.F_GETFL)
fcntl.fcntl(fd, fcntl.F_SETFL, fl | os.O_NONBLOCK)
- # There's potential problem if b10-dhcp4 prints out more
- # than 16k of text
- try:
- output = os.read(self.stdout_pipes[0], 16384)
- except OSError:
- print("No data available from stdout")
- output = ""
-
- # read can return None. Make sure we have a string
- if (output is None):
- output = ""
-
- try:
- error = os.read(self.stderr_pipes[0], 16384)
- except OSError:
- print("No data available on stderr")
- error = ""
-
- # read can return None. Make sure we have a string
- if (error is None):
- error = ""
-
- try:
- if (not pi.process.poll()):
- # let's be nice at first...
+ # As we don't know how long the subprocess will take to start and
+ # produce output, we'll loop and sleep for 250 ms between each
+ # iteration. To avoid an infinite loop, we'll loop for a maximum
+ # of five seconds: that should be enough.
+ for count in range(20):
+ # Read something from stderr and stdout (these reads don't block).
+ output = self.readPipe(self.stdout_pipes[0])
+ error = self.readPipe(self.stderr_pipes[0])
+
+ # If the process has already exited, or if it has output something,
+ # quit the loop now.
+ if pi.process.poll() is not None or len(error) > 0 or len(output) > 0:
+ break
+
+ # Process still running, try again in 250 ms.
+ time.sleep(0.25)
+
+ # Exited loop, kill the process if it is still running
+ if pi.process.poll() is None:
+ try:
pi.process.terminate()
- except OSError:
- print("Ignoring failed kill attempt. Process is dead already.")
+ except OSError:
+ print("Ignoring failed kill attempt. Process is dead already.")
# call this to get returncode, process should be dead by now
rc = pi.process.wait()
# Clean up our stdout/stderr munging.
os.dup2(self.stdout_old, sys.stdout.fileno())
+ os.close(self.stdout_old)
os.close(self.stdout_pipes[0])
os.dup2(self.stderr_old, sys.stderr.fileno())
+ os.close(self.stderr_old)
os.close(self.stderr_pipes[0])
+ # Free up resources (file descriptors) from the ProcessInfo object
+ # TODO: For some reason, this gives an error if the process has ended,
+ # although it does cause all descriptors still allocated to the
+ # object to be freed.
+ pi = None
+
print ("Process finished, return code=%d, stdout=%d bytes, stderr=%d bytes"
% (rc, len(output), len(error)) )
More information about the bind10-changes
mailing list