From: Mukund Sivaraman <muks@isc.org>
Date: Tue, 11 Dec 2012 00:24:01 +0000 (+0530)
Subject: Merge branch 'master' into trac2353
X-Git-Tag: bind10-1.0.0-beta-release~19^2~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0be62cb0f27a0855c007beabeb0c3ba3c4fb0ff;p=thirdparty%2Fkea.git

Merge branch 'master' into trac2353

Conflicts:
	src/bin/bind10/bind10_src.py.in
---

c0be62cb0f27a0855c007beabeb0c3ba3c4fb0ff
diff --cc src/bin/bind10/bind10_src.py.in
index e626d7999c,36ad760e01..972498aa10
--- a/src/bin/bind10/bind10_src.py.in
+++ b/src/bin/bind10/bind10_src.py.in
@@@ -440,12 -421,9 +436,13 @@@ class BoB
          # Now connect to the c-channel
          cc_connect_start = time.time()
          while self.cc_session is None:
 +            # if we are run under unittests, break
 +            if self._run_under_unittests:
 +                break
 +
              # if we have been trying for "a while" give up
 -            if (time.time() - cc_connect_start) > 5:
 +            if (time.time() - cc_connect_start) > self.msgq_timeout:
+                 logger.error(BIND10_CONNECTING_TO_CC_FAIL)
                  raise CChannelConnectError("Unable to connect to c-channel after 5 seconds")
  
              # try to connect, and if we can't wait a short while