svn commit: r1222330 - in /qpid/trunk/qpid/cpp/src/tests: brokertest.py topictest.ps1

[sh...@apache.org]

Author: shuston
Date: Thu Dec 22 16:27:33 2011
New Revision: 1222330

URL: http://svn.apache.org/viewvc?rev=1222330&view=rev
Log:
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

Modified:
    qpid/trunk/qpid/cpp/src/tests/brokertest.py
    qpid/trunk/qpid/cpp/src/tests/topictest.ps1

Modified: qpid/trunk/qpid/cpp/src/tests/brokertest.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/brokertest.py?rev=1222330&r1=1222329&r2=1222330&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/brokertest.py (original)
+++ qpid/trunk/qpid/cpp/src/tests/brokertest.py Thu Dec 22 16:27:33 2011
@@ -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):

Modified: qpid/trunk/qpid/cpp/src/tests/topictest.ps1
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/topictest.ps1?rev=1222330&r1=1222329&r2=1222330&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/topictest.ps1 (original)
+++ qpid/trunk/qpid/cpp/src/tests/topictest.ps1 Thu Dec 22 16:27:33 2011
@@ -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) {



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org