diff options
| author | Ted Ross <tross@apache.org> | 2011-03-22 02:21:07 +0000 |
|---|---|---|
| committer | Ted Ross <tross@apache.org> | 2011-03-22 02:21:07 +0000 |
| commit | 2d0ae1f0231ccb4183e403a710140a2e44984a12 (patch) | |
| tree | 8a5e8b0e4537c03b5fcdcb61f5eed034f3de9103 /qpid/cpp | |
| parent | 0c752c984bd90f33eea251bb47710cd9c5405eb6 (diff) | |
| download | qpid-python-2d0ae1f0231ccb4183e403a710140a2e44984a12.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@1084053 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
| -rw-r--r-- | qpid/cpp/bindings/qmf/tests/test_base.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qpid/cpp/bindings/qmf/tests/test_base.rb b/qpid/cpp/bindings/qmf/tests/test_base.rb index 3e4337a9c0..7d4609097c 100644 --- a/qpid/cpp/bindings/qmf/tests/test_base.rb +++ b/qpid/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) |