summaryrefslogtreecommitdiff
path: root/cpp/test
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/test')
-rwxr-xr-xcpp/test/Freeze/complex/run.py1
-rwxr-xr-xcpp/test/Glacier/starter/run.py10
-rwxr-xr-xcpp/test/IceStorm/federation/run.py38
-rwxr-xr-xcpp/test/IceStorm/federation2/run.py38
-rwxr-xr-xcpp/test/IceStorm/single/run.py26
-rwxr-xr-xcpp/test/IceXML/encoding/run.py4
-rwxr-xr-xcpp/test/Yellow/basicYellow/run.py10
7 files changed, 53 insertions, 74 deletions
diff --git a/cpp/test/Freeze/complex/run.py b/cpp/test/Freeze/complex/run.py
index b4905a90562..d95f4836d79 100755
--- a/cpp/test/Freeze/complex/run.py
+++ b/cpp/test/Freeze/complex/run.py
@@ -26,7 +26,6 @@ sys.path.append(os.path.join(toplevel, "config"))
import TestUtil
name = os.path.join("Freeze", "complex")
-
testdir = os.path.join(toplevel, "test", name)
#
diff --git a/cpp/test/Glacier/starter/run.py b/cpp/test/Glacier/starter/run.py
index 9ff32464fa3..972037e45ec 100755
--- a/cpp/test/Glacier/starter/run.py
+++ b/cpp/test/Glacier/starter/run.py
@@ -28,11 +28,7 @@ import TestUtil
starter = os.path.join(toplevel, "bin", "glacierstarter")
router = os.path.join(toplevel, "bin", "glacierrouter")
-updatedServerOptions = TestUtil.serverOptions.replace("TOPLEVELDIR", toplevel)
-updatedClientOptions = TestUtil.clientOptions.replace("TOPLEVELDIR", toplevel)
-updatedClientServerOptions = TestUtil.clientServerOptions.replace("TOPLEVELDIR", toplevel)
-
-command = starter + updatedClientServerOptions + \
+command = starter + TestUtil.clientServerOptions + \
r' --Glacier.Starter.RouterPath=' + router + \
r' --Glacier.Starter.PropertiesOverwrite=Ice.ServerIdleTime=10' \
r' --Glacier.Starter.CryptPasswords="' + toplevel + r'/test/Glacier/starter/passwords"' + \
@@ -48,11 +44,11 @@ TestUtil.getAdapterReady(starterPipe)
print "ok"
name = os.path.join("Glacier", "starter")
-TestUtil.mixedClientServerTest(toplevel, name)
+TestUtil.mixedClientServerTest(name)
# We run the test again, to check whether the glacier router starter
# can start up multiple routers.
-TestUtil.mixedClientServerTest(toplevel, name)
+TestUtil.mixedClientServerTest(name)
print "shutting down glacier starter...",
TestUtil.killServers() # TODO: Graceful shutdown.
diff --git a/cpp/test/IceStorm/federation/run.py b/cpp/test/IceStorm/federation/run.py
index 1b6ed930e93..727d0b42c97 100755
--- a/cpp/test/IceStorm/federation/run.py
+++ b/cpp/test/IceStorm/federation/run.py
@@ -32,42 +32,38 @@ iceBox = os.path.join(toplevel, "bin", "icebox")
iceBoxAdmin = os.path.join(toplevel, "bin", "iceboxadmin")
iceStormAdmin = os.path.join(toplevel, "bin", "icestormadmin")
-updatedServerOptions = TestUtil.serverOptions.replace("TOPLEVELDIR", toplevel)
-updatedClientOptions = TestUtil.clientOptions.replace("TOPLEVELDIR", toplevel)
-updatedClientServerOptions = TestUtil.clientServerOptions.replace("TOPLEVELDIR", toplevel)
+iceBoxEndpoints = ' --IceBox.ServiceManager.Endpoints="default -p 12345"'
-iceBoxEndpoints=' --IceBox.ServiceManager.Endpoints="default -p 12345"'
-
-iceStormService=" --IceBox.Service.IceStorm=IceStormService:create" + \
- ' --IceStorm.TopicManager.Endpoints="default -p 12346"' + \
- " --IceBox.PrintServicesReady=IceStorm"
-iceStormReference=' --IceStorm.TopicManager.Proxy="IceStorm/TopicManager: default -p 12346"'
+iceStormService = " --IceBox.Service.IceStorm=IceStormService:create" + \
+ ' --IceStorm.TopicManager.Endpoints="default -p 12346"' + \
+ " --IceBox.PrintServicesReady=IceStorm"
+iceStormReference = ' --IceStorm.TopicManager.Proxy="IceStorm/TopicManager: default -p 12346"'
dbEnvName = os.path.join(testdir, "db")
TestUtil.cleanDbDir(dbEnvName)
iceStormDBEnv=" --IceBox.DBEnvName.IceStorm=" + dbEnvName
print "starting icestorm service...",
-command = iceBox + updatedClientServerOptions + iceBoxEndpoints + iceStormService + iceStormDBEnv
+command = iceBox + TestUtil.clientServerOptions + iceBoxEndpoints + iceStormService + iceStormDBEnv
iceBoxPipe = os.popen(command)
TestUtil.getServerPid(iceBoxPipe)
TestUtil.waitServiceReady(iceBoxPipe, "IceStorm")
print "ok"
print "creating topics...",
-command = iceStormAdmin + updatedClientOptions + iceStormReference + r' -e "create fed1"'
+command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "create fed1"'
iceStormAdminPipe = os.popen(command)
iceStormAdminStatus = iceStormAdminPipe.close()
if iceStormAdminStatus:
TestUtil.killServers()
sys.exit(1)
-command = iceStormAdmin + updatedClientOptions + iceStormReference + r' -e "create fed2"'
+command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "create fed2"'
iceStormAdminPipe = os.popen(command)
iceStormAdminStatus = iceStormAdminPipe.close()
if iceStormAdminStatus:
TestUtil.killServers()
sys.exit(1)
-command = iceStormAdmin + updatedClientOptions + iceStormReference + r' -e "create fed3"'
+command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "create fed3"'
iceStormAdminPipe = os.popen(command)
iceStormAdminStatus = iceStormAdminPipe.close()
if iceStormAdminStatus:
@@ -76,13 +72,13 @@ if iceStormAdminStatus:
print "ok"
print "linking topics...",
-command = iceStormAdmin + updatedClientOptions + iceStormReference + r' -e "link fed1 fed2 10"'
+command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "link fed1 fed2 10"'
iceStormAdminPipe = os.popen(command)
iceStormAdminStatus = iceStormAdminPipe.close()
if iceStormAdminStatus:
TestUtil.killServers()
sys.exit(1)
-command = iceStormAdmin + updatedClientOptions + iceStormReference + r' -e "link fed2 fed3 5"'
+command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "link fed2 fed3 5"'
iceStormAdminPipe = os.popen(command)
iceStormAdminStatus = iceStormAdminPipe.close()
if iceStormAdminStatus:
@@ -104,7 +100,7 @@ except:
pass # Ignore errors if the lockfile is not present
print "starting subscriber...",
-command = subscriber + updatedClientServerOptions + iceStormReference + r' ' + subscriberLockFile
+command = subscriber + TestUtil.clientServerOptions + iceStormReference + r' ' + subscriberLockFile
subscriberPipe = os.popen(command)
TestUtil.getServerPid(subscriberPipe)
TestUtil.getAdapterReady(subscriberPipe)
@@ -122,7 +118,7 @@ print "ok"
# causes subscriber to terminate.
#
print "starting publisher...",
-command = publisher + updatedClientOptions + iceStormReference
+command = publisher + TestUtil.clientOptions + iceStormReference
publisherPipe = os.popen(command)
print "ok"
@@ -147,19 +143,19 @@ print "ok"
# Destroy the topic.
#
print "destroying topics...",
-command = iceStormAdmin + updatedClientOptions + iceStormReference + r' -e "destroy fed1"'
+command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "destroy fed1"'
iceStormAdminPipe = os.popen(command)
iceStormAdminStatus = iceStormAdminPipe.close()
if iceStormAdminStatus:
TestUtil.killServers()
sys.exit(1)
-command = iceStormAdmin + updatedClientOptions + iceStormReference + r' -e "destroy fed2"'
+command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "destroy fed2"'
iceStormAdminPipe = os.popen(command)
iceStormAdminStatus = iceStormAdminPipe.close()
if iceStormAdminStatus:
TestUtil.killServers()
sys.exit(1)
-command = iceStormAdmin + updatedClientOptions + iceStormReference + r' -e "destroy fed3"'
+command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "destroy fed3"'
iceStormAdminPipe = os.popen(command)
iceStormAdminStatus = iceStormAdminPipe.close()
if iceStormAdminStatus:
@@ -171,7 +167,7 @@ print "ok"
# Shutdown icestorm.
#
print "shutting down icestorm service...",
-command = iceBoxAdmin + updatedClientOptions + iceBoxEndpoints + r' shutdown'
+command = iceBoxAdmin + TestUtil.clientOptions + iceBoxEndpoints + r' shutdown'
iceBoxAdminPipe = os.popen(command)
iceBoxAdminStatus = iceBoxAdminPipe.close()
if iceBoxAdminStatus:
diff --git a/cpp/test/IceStorm/federation2/run.py b/cpp/test/IceStorm/federation2/run.py
index ca6e2cd11a6..019696da00b 100755
--- a/cpp/test/IceStorm/federation2/run.py
+++ b/cpp/test/IceStorm/federation2/run.py
@@ -32,42 +32,38 @@ iceBox = os.path.join(toplevel, "bin", "icebox")
iceBoxAdmin = os.path.join(toplevel, "bin", "iceboxadmin")
iceStormAdmin = os.path.join(toplevel, "bin", "icestormadmin")
-updatedServerOptions = TestUtil.serverOptions.replace("TOPLEVELDIR", toplevel)
-updatedClientOptions = TestUtil.clientOptions.replace("TOPLEVELDIR", toplevel)
-updatedClientServerOptions = TestUtil.clientServerOptions.replace("TOPLEVELDIR", toplevel)
+iceBoxEndpoints = ' --IceBox.ServiceManager.Endpoints="default -p 12345"'
-iceBoxEndpoints=' --IceBox.ServiceManager.Endpoints="default -p 12345"'
-
-iceStormService=" --IceBox.Service.IceStorm=IceStormService:create" + \
- ' --IceStorm.TopicManager.Endpoints="default -p 12346"' + \
- " --IceBox.PrintServicesReady=IceStorm"
-iceStormReference=' --IceStorm.TopicManager.Proxy="IceStorm/TopicManager: default -p 12346"'
+iceStormService = " --IceBox.Service.IceStorm=IceStormService:create" + \
+ ' --IceStorm.TopicManager.Endpoints="default -p 12346"' + \
+ " --IceBox.PrintServicesReady=IceStorm"
+iceStormReference = ' --IceStorm.TopicManager.Proxy="IceStorm/TopicManager: default -p 12346"'
dbEnvName = os.path.join(testdir, "db")
TestUtil.cleanDbDir(dbEnvName)
-iceStormDBEnv=" --IceBox.DBEnvName.IceStorm=" + dbEnvName
+iceStormDBEnv = " --IceBox.DBEnvName.IceStorm=" + dbEnvName
print "starting icestorm service...",
-command = iceBox + updatedClientServerOptions + iceBoxEndpoints + iceStormService + iceStormDBEnv
+command = iceBox + TestUtil.clientServerOptions + iceBoxEndpoints + iceStormService + iceStormDBEnv
iceBoxPipe = os.popen(command)
TestUtil.getServerPid(iceBoxPipe)
TestUtil.waitServiceReady(iceBoxPipe, "IceStorm")
print "ok"
print "creating topics...",
-command = iceStormAdmin + updatedClientOptions + iceStormReference + r' -e "create fed1"'
+command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "create fed1"'
iceStormAdminPipe = os.popen(command)
iceStormAdminStatus = iceStormAdminPipe.close()
if iceStormAdminStatus:
TestUtil.killServers()
sys.exit(1)
-command = iceStormAdmin + updatedClientOptions + iceStormReference + r' -e "create fed2"'
+command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "create fed2"'
iceStormAdminPipe = os.popen(command)
iceStormAdminStatus = iceStormAdminPipe.close()
if iceStormAdminStatus:
TestUtil.killServers()
sys.exit(1)
-command = iceStormAdmin + updatedClientOptions + iceStormReference + r' -e "create fed3"'
+command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "create fed3"'
iceStormAdminPipe = os.popen(command)
iceStormAdminStatus = iceStormAdminPipe.close()
if iceStormAdminStatus:
@@ -77,7 +73,7 @@ print "ok"
print "linking topics...",
graph = os.path.join(testdir, "fed.xml");
-command = iceStormAdmin + updatedClientOptions + iceStormReference + r' -e "graph ' + graph + r' 10"'
+command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "graph ' + graph + r' 10"'
iceStormAdminPipe = os.popen(command)
iceStormAdminStatus = iceStormAdminPipe.close()
if iceStormAdminStatus:
@@ -99,7 +95,7 @@ except:
pass # Ignore errors if the lockfile is not present
print "starting subscriber...",
-command = subscriber + updatedClientServerOptions + iceStormReference + r' ' + subscriberLockFile
+command = subscriber + TestUtil.clientServerOptions + iceStormReference + r' ' + subscriberLockFile
subscriberPipe = os.popen(command)
TestUtil.getServerPid(subscriberPipe)
TestUtil.getAdapterReady(subscriberPipe)
@@ -117,7 +113,7 @@ print "ok"
# causes subscriber to terminate.
#
print "starting publisher...",
-command = publisher + updatedClientOptions + iceStormReference
+command = publisher + TestUtil.clientOptions + iceStormReference
publisherPipe = os.popen(command)
print "ok"
@@ -142,19 +138,19 @@ print "ok"
# Destroy the topic.
#
print "destroying topics...",
-command = iceStormAdmin + updatedClientOptions + iceStormReference + r' -e "destroy fed1"'
+command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "destroy fed1"'
iceStormAdminPipe = os.popen(command)
iceStormAdminStatus = iceStormAdminPipe.close()
if iceStormAdminStatus:
TestUtil.killServers()
sys.exit(1)
-command = iceStormAdmin + updatedClientOptions + iceStormReference + r' -e "destroy fed2"'
+command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "destroy fed2"'
iceStormAdminPipe = os.popen(command)
iceStormAdminStatus = iceStormAdminPipe.close()
if iceStormAdminStatus:
TestUtil.killServers()
sys.exit(1)
-command = iceStormAdmin + updatedClientOptions + iceStormReference + r' -e "destroy fed3"'
+command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "destroy fed3"'
iceStormAdminPipe = os.popen(command)
iceStormAdminStatus = iceStormAdminPipe.close()
if iceStormAdminStatus:
@@ -166,7 +162,7 @@ print "ok"
# Shutdown icestorm.
#
print "shutting down icestorm service...",
-command = iceBoxAdmin + updatedClientOptions + iceBoxEndpoints + r' shutdown'
+command = iceBoxAdmin + TestUtil.clientOptions + iceBoxEndpoints + r' shutdown'
iceBoxAdminPipe = os.popen(command)
iceBoxAdminStatus = iceBoxAdminPipe.close()
if iceBoxAdminStatus:
diff --git a/cpp/test/IceStorm/single/run.py b/cpp/test/IceStorm/single/run.py
index 86ad3d6ef06..a9b658e9b07 100755
--- a/cpp/test/IceStorm/single/run.py
+++ b/cpp/test/IceStorm/single/run.py
@@ -32,23 +32,19 @@ iceBox = os.path.join(toplevel, "bin", "icebox")
iceBoxAdmin = os.path.join(toplevel, "bin", "iceboxadmin")
iceStormAdmin = os.path.join(toplevel, "bin", "icestormadmin")
-updatedServerOptions = TestUtil.serverOptions.replace("TOPLEVELDIR", toplevel)
-updatedClientOptions = TestUtil.clientOptions.replace("TOPLEVELDIR", toplevel)
-updatedClientServerOptions = TestUtil.clientServerOptions.replace("TOPLEVELDIR", toplevel)
+iceBoxEndpoints = ' --IceBox.ServiceManager.Endpoints="default -p 12345"'
-iceBoxEndpoints=' --IceBox.ServiceManager.Endpoints="default -p 12345"'
-
-iceStormService=" --IceBox.Service.IceStorm=IceStormService:create" + \
- ' --IceStorm.TopicManager.Endpoints="default -p 12346"' + \
- " --IceBox.PrintServicesReady=IceStorm"
-iceStormReference=' --IceStorm.TopicManager.Proxy="IceStorm/TopicManager:default -p 12346"'
+iceStormService = " --IceBox.Service.IceStorm=IceStormService:create" + \
+ ' --IceStorm.TopicManager.Endpoints="default -p 12346"' + \
+ " --IceBox.PrintServicesReady=IceStorm"
+iceStormReference = ' --IceStorm.TopicManager.Proxy="IceStorm/TopicManager:default -p 12346"'
dbEnvName = os.path.join(testdir, "db")
TestUtil.cleanDbDir(dbEnvName)
iceStormDBEnv=" --IceBox.DBEnvName.IceStorm=" + dbEnvName
print "starting icestorm service...",
-command = iceBox + updatedClientServerOptions + iceBoxEndpoints + iceStormService + iceStormDBEnv
+command = iceBox + TestUtil.clientServerOptions + iceBoxEndpoints + iceStormService + iceStormDBEnv
iceBoxPipe = os.popen(command)
TestUtil.getServerPid(iceBoxPipe)
#TestUtil.getAdapterReady(iceBoxPipe)
@@ -56,7 +52,7 @@ TestUtil.waitServiceReady(iceBoxPipe, "IceStorm")
print "ok"
print "creating topic...",
-command = iceStormAdmin + updatedClientOptions + iceStormReference + r' -e "create single"'
+command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "create single"'
iceStormAdminPipe = os.popen(command)
iceStormAdminStatus = iceStormAdminPipe.close()
if iceStormAdminStatus:
@@ -78,7 +74,7 @@ except:
pass # Ignore errors if the lockfile is not present
print "starting subscriber...",
-command = subscriber + updatedClientServerOptions + iceStormReference + r' ' + subscriberLockFile
+command = subscriber + TestUtil.clientServerOptions + iceStormReference + r' ' + subscriberLockFile
subscriberPipe = os.popen(command)
TestUtil.getServerPid(subscriberPipe)
TestUtil.getAdapterReady(subscriberPipe)
@@ -96,7 +92,7 @@ print "ok"
# causes subscriber to terminate.
#
print "starting publisher...",
-command = publisher + updatedClientOptions + iceStormReference
+command = publisher + TestUtil.clientOptions + iceStormReference
publisherPipe = os.popen(command)
print "ok"
@@ -121,7 +117,7 @@ print "ok"
# Destroy the topic.
#
print "destroying topic...",
-command = iceStormAdmin + updatedClientOptions + iceStormReference + r' -e "destroy single"'
+command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "destroy single"'
iceStormAdminPipe = os.popen(command)
iceStormAdminStatus = iceStormAdminPipe.close()
if iceStormAdminStatus:
@@ -133,7 +129,7 @@ print "ok"
# Shutdown icestorm.
#
print "shutting down icestorm service...",
-command = iceBoxAdmin + updatedClientOptions + iceBoxEndpoints + r' shutdown'
+command = iceBoxAdmin + TestUtil.clientOptions + iceBoxEndpoints + r' shutdown'
iceBoxAdminPipe = os.popen(command)
iceBoxAdminStatus = iceBoxAdminPipe.close()
if iceBoxAdminStatus:
diff --git a/cpp/test/IceXML/encoding/run.py b/cpp/test/IceXML/encoding/run.py
index 122dc46a26c..bedb99983ce 100755
--- a/cpp/test/IceXML/encoding/run.py
+++ b/cpp/test/IceXML/encoding/run.py
@@ -29,10 +29,10 @@ name = os.path.join("IceXML", "encoding")
testdir = os.path.join(toplevel, "test", name)
-client = os.path.join(testdir, "client" + ' ' + testdir)
+client = os.path.join(testdir, "client")
print "starting client...",
-clientPipe = os.popen(client)
+clientPipe = os.popen(client + " " + testdir)
print "ok"
for output in clientPipe.xreadlines():
diff --git a/cpp/test/Yellow/basicYellow/run.py b/cpp/test/Yellow/basicYellow/run.py
index ac2c9aa3951..5ab900e2eb2 100755
--- a/cpp/test/Yellow/basicYellow/run.py
+++ b/cpp/test/Yellow/basicYellow/run.py
@@ -31,10 +31,6 @@ testdir = os.path.join(toplevel, "test", name)
IceBox = os.path.join(toplevel, "bin", "icebox")
IceBoxAdmin = os.path.join(toplevel, "bin", "iceboxadmin")
-updatedServerOptions = TestUtil.serverOptions.replace("TOPLEVELDIR", toplevel)
-updatedClientOptions = TestUtil.clientOptions.replace("TOPLEVELDIR", toplevel)
-updatedClientServerOptions = TestUtil.clientServerOptions.replace("TOPLEVELDIR", toplevel)
-
IceBoxEndpoints=' --IceBox.ServiceManager.Endpoints="default -p 12345"'
YellowService=" --IceBox.Service.Yellow=YellowService:create" + \
' --Yellow.Query.Endpoints="default -p 12346" --Yellow.Admin.Endpoints="default -p 12347"' + \
@@ -45,7 +41,7 @@ TestUtil.cleanDbDir(dbEnvName)
YellowDBEnv=" --IceBox.DBEnvName.Yellow=" + dbEnvName
print "starting yellow service...",
-command = IceBox + updatedClientServerOptions + IceBoxEndpoints + YellowService + YellowDBEnv
+command = IceBox + TestUtil.clientServerOptions + IceBoxEndpoints + YellowService + YellowDBEnv
IceBoxPipe = os.popen(command)
TestUtil.getServerPid(IceBoxPipe)
TestUtil.waitServiceReady(IceBoxPipe, "Yellow")
@@ -56,7 +52,7 @@ client = os.path.join(testdir, "client")
# Start the client.
#
print "starting client...",
-command = client + updatedClientOptions
+command = client + TestUtil.clientOptions
clientPipe = os.popen(command)
print "ok"
@@ -67,7 +63,7 @@ for output in clientPipe.xreadlines():
# Shutdown yellow.
#
print "shutting down yellow service...",
-command = IceBoxAdmin + updatedClientOptions + IceBoxEndpoints + r' shutdown'
+command = IceBoxAdmin + TestUtil.clientOptions + IceBoxEndpoints + r' shutdown'
IceBoxAdminPipe = os.popen(command)
IceBoxAdminStatus = IceBoxAdminPipe.close()
if IceBoxAdminStatus:
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 00:10:33 +0000