diff options
| author | Stephen D. Huston <shuston@apache.org> | 2011-12-22 16:27:33 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2011-12-22 16:27:33 +0000 |
| commit | ea80ff8b1ed5e448b56b69c513195017c18f1808 (patch) | |
| tree | 5b9ce4d80ef3f5fcf2d794369bdfa29328424c1e /qpid/cpp/src/tests | |
| parent | edb5252d682475def83ad2a2df2837f90e43ff99 (diff) | |
| download | qpid-python-ea80ff8b1ed5e448b56b69c513195017c18f1808.tar.gz | |
Adjust topictest.ps1 to use correct executable names (they changed some time ago); extend broker start timeout on brokertest.ps1 (Windows broker now takes 19 sec to start?!). NO-JIRA
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1222330 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests')
| -rw-r--r-- | qpid/cpp/src/tests/brokertest.py | 2 | ||||
| -rw-r--r-- | qpid/cpp/src/tests/topictest.ps1 | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/qpid/cpp/src/tests/brokertest.py b/qpid/cpp/src/tests/brokertest.py index 12aed1f671..752e5603c8 100644 --- a/qpid/cpp/src/tests/brokertest.py +++ b/qpid/cpp/src/tests/brokertest.py @@ -373,7 +373,7 @@ class Broker(Popen): self._log_ready = find_in_file("notice Broker running", self.log) return self._log_ready - def ready(self, timeout=5, **kwargs): + def ready(self, timeout=30, **kwargs): """Wait till broker is ready to serve clients""" # First make sure the broker is listening by checking the log. if not retry(self.log_ready, timeout=timeout): diff --git a/qpid/cpp/src/tests/topictest.ps1 b/qpid/cpp/src/tests/topictest.ps1 index 59a483c2d5..f15b2d452c 100644 --- a/qpid/cpp/src/tests/topictest.ps1 +++ b/qpid/cpp/src/tests/topictest.ps1 @@ -40,13 +40,13 @@ if ($t) { } # Find which subdir the exes are in -. $srcdir\find_prog.ps1 .\topic_listener.exe +. $srcdir\find_prog.ps1 .\qpid-topic-listener.exe function subscribe { param ([int]$num, [string]$sub) "Start subscriber $num" $LOG = "subscriber_$num.log" - $cmdline = ".\$sub\topic_listener $transactional > $LOG 2>&1 + $cmdline = ".\$sub\qpid-topic-listener $transactional > $LOG 2>&1 if (`$LastExitCode -ne 0) { Remove-Item $LOG }" $cmdblock = $executioncontext.invokecommand.NewScriptBlock($cmdline) . $srcdir\background.ps1 $cmdblock @@ -54,7 +54,7 @@ function subscribe { function publish { param ([string]$sub) - Invoke-Expression ".\$sub\topic_publisher --messages $message_count --batches $batches --subscribers $subscribers $host $transactional" 2>&1 + Invoke-Expression ".\$sub\qpid-topic-publisher --messages $message_count --batches $batches --subscribers $subscribers $host $transactional" 2>&1 } if ($broker.length) { |