summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorTed Ross <tross@apache.org>2011-03-22 02:21:07 +0000
committerTed Ross <tross@apache.org>2011-03-22 02:21:07 +0000
commit3735a6163a83f650bc3341f5dffa2b1b5949dc84 (patch)
tree22151babe69ca805739cfc3ebd9d4901a57595f6 /cpp
parentbebc7425039ee37dfad5631c3d344f298042622b (diff)
downloadqpid-python-3735a6163a83f650bc3341f5dffa2b1b5949dc84.tar.gz
NO-JIRA - Fixed two problems in the qmf-interop tests:
1) Added a 2-second delay on console startup. This closes the window on a race condition that occurs when the console and agent start at exactly the same time. Note that this race has been designed out of the QMFv2 protocol. 2) Fixed a reference to an incorrect variable name in the assert(cond) message. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1084053 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
-rw-r--r--cpp/bindings/qmf/tests/test_base.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/bindings/qmf/tests/test_base.rb b/cpp/bindings/qmf/tests/test_base.rb
index 3e4337a9c0..7d4609097c 100644
--- a/cpp/bindings/qmf/tests/test_base.rb
+++ b/cpp/bindings/qmf/tests/test_base.rb
@@ -24,6 +24,7 @@ require 'socket'
class ConsoleTestBase < Qmf::ConsoleHandler
def initialize
+ sleep(2)
@settings = Qmf::ConnectionSettings.new
@settings.host = ARGV[0] if ARGV.size > 0
@settings.port = ARGV[1].to_i if ARGV.size > 1
@@ -67,7 +68,7 @@ class ConsoleTestBase < Qmf::ConsoleHandler
def assert(condition, in_text=nil)
text = " (#{in_text})" if in_text
- raise "Assertion failed: #{left} != #{right}#{text}" unless condition
+ raise "Assertion failed: #{condition} #{text}" unless condition
end
def fail(text)