From 9d7e9fc04fa41b7583097f672f33ed8a089192f2 Mon Sep 17 00:00:00 2001
From: "Stephen D. Huston" <shuston@apache.org>
Date: Thu, 22 Dec 2011 16:27:33 +0000
Subject: 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/qpid@1222330 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/tests/brokertest.py | 2 +-
 cpp/src/tests/topictest.ps1 | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'cpp/src')

diff --git a/cpp/src/tests/brokertest.py b/cpp/src/tests/brokertest.py
index 12aed1f671..752e5603c8 100644
--- a/cpp/src/tests/brokertest.py
+++ b/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/cpp/src/tests/topictest.ps1 b/cpp/src/tests/topictest.ps1
index 59a483c2d5..f15b2d452c 100644
--- a/cpp/src/tests/topictest.ps1
+++ b/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) {
-- 
cgit v1.2.1