summaryrefslogtreecommitdiff
path: root/cpp/test/IceStorm
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/test/IceStorm')
-rw-r--r--cpp/test/IceStorm/federation/Makefile.mak8
-rw-r--r--cpp/test/IceStorm/federation2/Makefile.mak16
-rw-r--r--cpp/test/IceStorm/rep1/Makefile.mak6
-rwxr-xr-xcpp/test/IceStorm/rep1/run.py4
-rw-r--r--cpp/test/IceStorm/repstress/Makefile.mak6
-rwxr-xr-xcpp/test/IceStorm/repstress/run.py4
-rw-r--r--cpp/test/IceStorm/single/Makefile.mak8
-rwxr-xr-xcpp/test/IceStorm/single/run.py3
-rw-r--r--cpp/test/IceStorm/stress/Makefile.mak16
-rwxr-xr-xcpp/test/IceStorm/stress/run.py2
10 files changed, 37 insertions, 36 deletions
diff --git a/cpp/test/IceStorm/federation/Makefile.mak b/cpp/test/IceStorm/federation/Makefile.mak
index 133819db19f..b5d4596954d 100644
--- a/cpp/test/IceStorm/federation/Makefile.mak
+++ b/cpp/test/IceStorm/federation/Makefile.mak
@@ -60,9 +60,9 @@ clean::
del /q build.txt
del /q Event.cpp Event.h
del /q db\topicmanager db\log.*
- for %f in (db\*) do if not %f == db\.gitignore del /q %f
- for %f in (0.db\*) do if not %f == 0.db\.gitignore del /q %f
- for %f in (1.db\*) do if not %f == 1.db\.gitignore del /q %f
- for %f in (2.db\*) do if not %f == 2.db\.gitignore del /q %f
+ -for %f in (db\*) do if not %f == db\.gitignore del /q %f
+ -for %f in (0.db\*) do if not %f == 0.db\.gitignore del /q %f
+ -for %f in (1.db\*) do if not %f == 1.db\.gitignore del /q %f
+ -for %f in (2.db\*) do if not %f == 2.db\.gitignore del /q %f
!include .depend
diff --git a/cpp/test/IceStorm/federation2/Makefile.mak b/cpp/test/IceStorm/federation2/Makefile.mak
index e47367df4ba..1c63d24eaad 100644
--- a/cpp/test/IceStorm/federation2/Makefile.mak
+++ b/cpp/test/IceStorm/federation2/Makefile.mak
@@ -59,13 +59,13 @@ all::
clean::
del /q build.txt
del /q Event.cpp Event.h
- for %f in (db\*) do if not %f == db\.gitignore del /q %f
- for %f in (0.db\*) do if not %f == 0.db\.gitignore del /q %f
- for %f in (1.db\*) do if not %f == 1.db\.gitignore del /q %f
- for %f in (2.db\*) do if not %f == 2.db\.gitignore del /q %f
- for %f in (db2\*) do if not %f == db2\.gitignore del /q %f
- for %f in (0.db2\*) do if not %f == 0.db2\.gitignore del /q %f
- for %f in (1.db2\*) do if not %f == 1.db2\.gitignore del /q %f
- for %f in (2.db2\*) do if not %f == 2.db2\.gitignore del /q %f
+ -for %f in (db\*) do if not %f == db\.gitignore del /q %f
+ -for %f in (0.db\*) do if not %f == 0.db\.gitignore del /q %f
+ -for %f in (1.db\*) do if not %f == 1.db\.gitignore del /q %f
+ -for %f in (2.db\*) do if not %f == 2.db\.gitignore del /q %f
+ -for %f in (db2\*) do if not %f == db2\.gitignore del /q %f
+ -for %f in (0.db2\*) do if not %f == 0.db2\.gitignore del /q %f
+ -for %f in (1.db2\*) do if not %f == 1.db2\.gitignore del /q %f
+ -for %f in (2.db2\*) do if not %f == 2.db2\.gitignore del /q %f
!include .depend
diff --git a/cpp/test/IceStorm/rep1/Makefile.mak b/cpp/test/IceStorm/rep1/Makefile.mak
index a0d0ced285b..39322cbde44 100644
--- a/cpp/test/IceStorm/rep1/Makefile.mak
+++ b/cpp/test/IceStorm/rep1/Makefile.mak
@@ -69,8 +69,8 @@ all::
clean::
del /q build.txt
del /q Single.cpp Single.h
- for %f in (0.db\*) do if not %f == 0.db\.gitignore del /q %f
- for %f in (1.db\*) do if not %f == 1.db\.gitignore del /q %f
- for %f in (2.db\*) do if not %f == 2.db\.gitignore del /q %f
+ -for %f in (0.db\*) do if not %f == 0.db\.gitignore del /q %f
+ -for %f in (1.db\*) do if not %f == 1.db\.gitignore del /q %f
+ -for %f in (2.db\*) do if not %f == 2.db\.gitignore del /q %f
!include .depend
diff --git a/cpp/test/IceStorm/rep1/run.py b/cpp/test/IceStorm/rep1/run.py
index 5ef589d9d00..dd374f172d4 100755
--- a/cpp/test/IceStorm/rep1/run.py
+++ b/cpp/test/IceStorm/rep1/run.py
@@ -42,7 +42,7 @@ def runtest(opt, ref, subopt="", pubopt=""):
subscriberProc.waitTestSuccess(timeout=30)
def runsub2(replica = -1, expect = None):
- proc = TestUtil.startServer(subscriber2, icestorm.reference(replica) + ' --id foo', count=0)
+ proc = TestUtil.startServer(subscriber2, icestorm.reference(replica) + ' --id foo', count=0, echo = False)
if expect:
proc.expect(expect)
proc.wait()
@@ -55,7 +55,7 @@ def rununsub2(replica = -1, expect = None):
proc.waitTestSuccess()
# Else we first subscribe to this replica, then unsub. We
# shouldn't get an AlreadySubscribedException.
- proc = TestUtil.startServer(subscriber2, icestorm.reference(replica) + ' --id foo', count=0)
+ proc = TestUtil.startServer(subscriber2, icestorm.reference(replica) + ' --id foo', count=0, echo = False)
if expect:
proc.expect(expect)
proc.wait()
diff --git a/cpp/test/IceStorm/repstress/Makefile.mak b/cpp/test/IceStorm/repstress/Makefile.mak
index 32c89df4ef6..dc8528508f6 100644
--- a/cpp/test/IceStorm/repstress/Makefile.mak
+++ b/cpp/test/IceStorm/repstress/Makefile.mak
@@ -71,8 +71,8 @@ clean::
del /q build.txt
del /q Single.cpp Single.h
del /q Controller.cpp Controller.h
- for %f in (0.db\*) do if not %f == 0.db\.gitignore del /q %f
- for %f in (1.db\*) do if not %f == 1.db\.gitignore del /q %f
- for %f in (2.db\*) do if not %f == 2.db\.gitignore del /q %f
+ -for %f in (0.db\*) do if not %f == 0.db\.gitignore del /q %f
+ -for %f in (1.db\*) do if not %f == 1.db\.gitignore del /q %f
+ -for %f in (2.db\*) do if not %f == 2.db\.gitignore del /q %f
!include .depend
diff --git a/cpp/test/IceStorm/repstress/run.py b/cpp/test/IceStorm/repstress/run.py
index 848d41b10d1..46bb3d7ce51 100755
--- a/cpp/test/IceStorm/repstress/run.py
+++ b/cpp/test/IceStorm/repstress/run.py
@@ -41,14 +41,14 @@ print "ok"
print "running subscriber...",
sys.stdout.flush()
-subscriberProc = TestUtil.startServer(subscriber, ' --Ice.ServerIdleTime=0 ' + icestorm.reference())
+subscriberProc = TestUtil.startServer(subscriber, ' --Ice.ServerIdleTime=0 ' + icestorm.reference(), echo = False)
subscriberProc.expect("([^\n]+)\n")
subControl = subscriberProc.match.group(1)
print "ok"
print "running publisher...",
sys.stdout.flush()
-publisherProc = TestUtil.startServer(publisher, ' --Ice.ServerIdleTime=0 ' + icestorm.reference())
+publisherProc = TestUtil.startServer(publisher, ' --Ice.ServerIdleTime=0 ' + icestorm.reference(), echo = False)
publisherProc.expect("([^\n]+)\n")
pubControl = publisherProc.match.group(1)
print "ok"
diff --git a/cpp/test/IceStorm/single/Makefile.mak b/cpp/test/IceStorm/single/Makefile.mak
index 3e5130f0675..d2d61a56a09 100644
--- a/cpp/test/IceStorm/single/Makefile.mak
+++ b/cpp/test/IceStorm/single/Makefile.mak
@@ -60,9 +60,9 @@ all::
clean::
del /q build.txt
del /q Single.cpp Single.h
- for %f in (db\*) do if not %f == db\.gitignore del /q %f
- for %f in (0.db\*) do if not %f == 0.db\.gitignore del /q %f
- for %f in (1.db\*) do if not %f == 1.db\.gitignore del /q %f
- for %f in (2.db\*) do if not %f == 2.db\.gitignore del /q %f
+ -for %f in (db\*) do if not %f == db\.gitignore del /q %f
+ -for %f in (0.db\*) do if not %f == 0.db\.gitignore del /q %f
+ -for %f in (1.db\*) do if not %f == 1.db\.gitignore del /q %f
+ -for %f in (2.db\*) do if not %f == 2.db\.gitignore del /q %f
!include .depend
diff --git a/cpp/test/IceStorm/single/run.py b/cpp/test/IceStorm/single/run.py
index 9836610462a..c3bfc29607b 100755
--- a/cpp/test/IceStorm/single/run.py
+++ b/cpp/test/IceStorm/single/run.py
@@ -45,8 +45,9 @@ def dotest(type):
#
print "starting publisher...",
sys.stdout.flush()
- publisherProc = TestUtil.startClient(publisher, icestorm.reference())
+ publisherProc = TestUtil.startClient(publisher, icestorm.reference(), startReader = False)
print "ok"
+ publisherProc.startReader()
subscriberProc.waitTestSuccess()
publisherProc.waitTestSuccess()
diff --git a/cpp/test/IceStorm/stress/Makefile.mak b/cpp/test/IceStorm/stress/Makefile.mak
index e47367df4ba..1c63d24eaad 100644
--- a/cpp/test/IceStorm/stress/Makefile.mak
+++ b/cpp/test/IceStorm/stress/Makefile.mak
@@ -59,13 +59,13 @@ all::
clean::
del /q build.txt
del /q Event.cpp Event.h
- for %f in (db\*) do if not %f == db\.gitignore del /q %f
- for %f in (0.db\*) do if not %f == 0.db\.gitignore del /q %f
- for %f in (1.db\*) do if not %f == 1.db\.gitignore del /q %f
- for %f in (2.db\*) do if not %f == 2.db\.gitignore del /q %f
- for %f in (db2\*) do if not %f == db2\.gitignore del /q %f
- for %f in (0.db2\*) do if not %f == 0.db2\.gitignore del /q %f
- for %f in (1.db2\*) do if not %f == 1.db2\.gitignore del /q %f
- for %f in (2.db2\*) do if not %f == 2.db2\.gitignore del /q %f
+ -for %f in (db\*) do if not %f == db\.gitignore del /q %f
+ -for %f in (0.db\*) do if not %f == 0.db\.gitignore del /q %f
+ -for %f in (1.db\*) do if not %f == 1.db\.gitignore del /q %f
+ -for %f in (2.db\*) do if not %f == 2.db\.gitignore del /q %f
+ -for %f in (db2\*) do if not %f == db2\.gitignore del /q %f
+ -for %f in (0.db2\*) do if not %f == 0.db2\.gitignore del /q %f
+ -for %f in (1.db2\*) do if not %f == 1.db2\.gitignore del /q %f
+ -for %f in (2.db2\*) do if not %f == 2.db2\.gitignore del /q %f
!include .depend
diff --git a/cpp/test/IceStorm/stress/run.py b/cpp/test/IceStorm/stress/run.py
index 62c13544a86..723b121944a 100755
--- a/cpp/test/IceStorm/stress/run.py
+++ b/cpp/test/IceStorm/stress/run.py
@@ -48,7 +48,7 @@ def runAdmin(cmd, desc = None):
if desc:
print desc,
sys.stdout.flush()
- proc = TestUtil.startClient(iceStormAdmin, adminIceStormReference + r' -e "%s"' % cmd)
+ proc = TestUtil.startClient(iceStormAdmin, adminIceStormReference + r' -e "%s"' % cmd, startReader = True)
proc.waitTestSuccess()
if desc:
print "ok"
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 21:09:52 +0000