summaryrefslogtreecommitdiff
path: root/cpp/test
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/test')
-rw-r--r--cpp/test/IceGrid/activation/Server.cpp2
-rw-r--r--cpp/test/IceGrid/activation/application.xml7
-rw-r--r--cpp/test/IceGrid/allocation/application.xml4
-rw-r--r--cpp/test/IceGrid/distribution/application.xml9
-rw-r--r--cpp/test/IceGrid/replicaGroup/application.xml3
-rw-r--r--cpp/test/IceGrid/replication/AllTests.cpp25
-rw-r--r--cpp/test/IceGrid/replication/application.xml2
-rw-r--r--cpp/test/IceGrid/session/AllTests.cpp7
-rw-r--r--cpp/test/IceGrid/session/application.xml5
-rw-r--r--cpp/test/IceGrid/simple/simple_server.xml2
-rw-r--r--cpp/test/IceGrid/update/AllTests.cpp14
11 files changed, 54 insertions, 26 deletions
diff --git a/cpp/test/IceGrid/activation/Server.cpp b/cpp/test/IceGrid/activation/Server.cpp
index 721c2132427..fe73297e8f7 100644
--- a/cpp/test/IceGrid/activation/Server.cpp
+++ b/cpp/test/IceGrid/activation/Server.cpp
@@ -36,7 +36,7 @@ Server::run(int argc, char* argv[])
Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
TestI* test = new TestI(adapter);
Ice::ObjectPtr obj = test;
- adapter->add(test, communicator()->stringToIdentity(properties->getProperty("Ice.ServerId")));
+ adapter->add(test, communicator()->stringToIdentity(properties->getProperty("Ice.Admin.ServerId")));
int delay = properties->getPropertyAsInt("ActivationDelay");
if(delay > 0)
diff --git a/cpp/test/IceGrid/activation/application.xml b/cpp/test/IceGrid/activation/application.xml
index 39d9f2f3aab..c1a892841e8 100644
--- a/cpp/test/IceGrid/activation/application.xml
+++ b/cpp/test/IceGrid/activation/application.xml
@@ -13,7 +13,7 @@
activation="${activation}"
activation-timeout="${activation-timeout}"
deactivation-timeout="${deactivation-timeout}">
- <adapter name="TestAdapter" endpoints="default" register-process="true">
+ <adapter name="TestAdapter" endpoints="default">
<object identity="${server}" type="Test"/>
<allocatable identity="${server}" type="Test"/>
</adapter>
@@ -30,6 +30,7 @@
<option>--nowarn</option>
<adapter name="IceGrid.Node" endpoints="default" register-process="true" server-lifetime="false"/>
<dbenv name="data"/>
+ <property name="Ice.Admin.Endpoints" value=""/>
<property name="IceGrid.Node.Name" value="${server}"/>
<property name="IceGrid.Node.Data" value="${node.datadir}/servers/${server}/dbs/data"/>
<property name="IceGrid.Node.PropertiesOverride"
@@ -52,12 +53,12 @@
<server-instance template="Server" id="fail-on-startup" fail-on-startup="1"/>
<server id="invalid-exe" exe="server2" activation="on-demand">
- <adapter name="TestAdapter" endpoints="default" register-process="true">
+ <adapter name="TestAdapter" endpoints="default">
<object identity="${server}" type="Test"/>
</adapter>
</server>
<server id="invalid-pwd" exe="./server" pwd="./bogus">
- <adapter name="TestAdapter" endpoints="default" register-process="true">
+ <adapter name="TestAdapter" endpoints="default">
<object identity="${server}" type="Test"/>
</adapter>
</server>
diff --git a/cpp/test/IceGrid/allocation/application.xml b/cpp/test/IceGrid/allocation/application.xml
index 8e68bcc2b3b..e48545892b6 100644
--- a/cpp/test/IceGrid/allocation/application.xml
+++ b/cpp/test/IceGrid/allocation/application.xml
@@ -11,9 +11,7 @@
<server id="${id}" exe="${ice.dir}/bin/glacier2router">
<property name="Glacier2.Client.Endpoints" value="${endpoints}"/>
<property name="Glacier2.Server.Endpoints" value="tcp -h 127.0.0.1"/>
- <property name="Glacier2.Admin.Endpoints" value="tcp -h 127.0.0.1"/>
- <property name="Glacier2.Admin.RegisterProcess" value="1"/>
-
+ <property name="Glacier2.Admin.Endpoints" value="tcp -h 127.0.0.1"/>
<property name="Glacier2.SessionManager" value="${manager}"/>
<property name="Glacier2.SSLSessionManager" value="IceGrid/SSLSessionManager"/>
<property name="Glacier2.PermissionsVerifier" value="${verifier}"/>
diff --git a/cpp/test/IceGrid/distribution/application.xml b/cpp/test/IceGrid/distribution/application.xml
index 1ca369759aa..dcdd5da7028 100644
--- a/cpp/test/IceGrid/distribution/application.xml
+++ b/cpp/test/IceGrid/distribution/application.xml
@@ -15,8 +15,7 @@
<adapter name="IcePatch2" endpoints="${endpoints}">
<object identity="${instance-name}/server" type="::IcePatch2::FileServer"/>
</adapter>
- <adapter name="IcePatch2.Admin" endpoints="tcp -h 127.0.0.1"
- register-process="true"/>
+ <adapter name="IcePatch2.Admin" endpoints="tcp -h 127.0.0.1"/>
<properties>
<property name="IcePatch2.InstanceName" value="${instance-name}"/>
<property name="IcePatch2.Directory" value="${directory}"/>
@@ -38,7 +37,7 @@
endpoints="default -p 12001"/>
<server id="server-all" exe="${test.dir}/server" activation="on-demand">
- <adapter name="Server" endpoints="default" register-process="true">
+ <adapter name="Server" endpoints="default">
<object identity="${server}"/>
</adapter>
<distrib/>
@@ -49,7 +48,7 @@
</server>
<server id="server-all-direct" exe="${test.dir}/server" activation="on-demand">
- <adapter name="Server" endpoints="default" register-process="true">
+ <adapter name="Server" endpoints="default">
<object identity="${server}"/>
</adapter>
<distrib icepatch="IcePatch2-Direct/server:default -p 12001"/>
@@ -60,7 +59,7 @@
</server>
<server id="server-dir1" exe="${test.dir}/server" activation="on-demand">
- <adapter name="Server" endpoints="default" register-process="true">
+ <adapter name="Server" endpoints="default">
<object identity="${server}"/>
</adapter>
<distrib>
diff --git a/cpp/test/IceGrid/replicaGroup/application.xml b/cpp/test/IceGrid/replicaGroup/application.xml
index f0739edbed6..ab33d88b2f1 100644
--- a/cpp/test/IceGrid/replicaGroup/application.xml
+++ b/cpp/test/IceGrid/replicaGroup/application.xml
@@ -62,8 +62,7 @@
<server-template id="IceBox">
<parameter name="id"/>
<parameter name="replicaGroup"/>
- <icebox id="${id}" exe="${icebox.exe}" activation="on-demand" pwd=".">
- <adapter name="IceBox.ServiceManager" endpoints="tcp -h 127.0.0.1" register-process="true"/>
+ <icebox id="${id}" exe="${icebox.exe}" activation="on-demand" pwd=".">
<service-instance template="Service" name="Service1" replicaGroup="${replicaGroup}" priority="3"/>
<service-instance template="Service" name="Service2" replicaGroup="${replicaGroup}" priority="2"/>
<service-instance template="Service" name="Service3" replicaGroup="${replicaGroup}" priority="1"/>
diff --git a/cpp/test/IceGrid/replication/AllTests.cpp b/cpp/test/IceGrid/replication/AllTests.cpp
index 3360ca70664..9be7f576f29 100644
--- a/cpp/test/IceGrid/replication/AllTests.cpp
+++ b/cpp/test/IceGrid/replication/AllTests.cpp
@@ -72,6 +72,15 @@ private:
};
typedef IceUtil::Handle<SessionKeepAliveThread> SessionKeepAliveThreadPtr;
+void
+addProperty(const CommunicatorDescriptorPtr& communicator, const string& name, const string& value)
+{
+ PropertyDescriptor prop;
+ prop.name = name;
+ prop.value = value;
+ communicator->propertySet.properties.push_back(prop);
+}
+
void
waitForServerState(const IceGrid::AdminPrx& admin, const std::string& server, bool up)
{
@@ -914,11 +923,12 @@ allTests(const Ice::CommunicatorPtr& comm)
server->id = "Server";
server->exe = comm->getProperties()->getProperty("TestDir") + "/server";
server->pwd = ".";
+ addProperty(server, "Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
server->activation = "on-demand";
AdapterDescriptor adapter;
adapter.name = "TestAdapter";
adapter.id = "TestAdapter.Server";
- adapter.registerProcess = true;
+ adapter.registerProcess = false;
PropertyDescriptor property;
property.name = "TestAdapter.Endpoints";
property.value = "default";
@@ -1086,11 +1096,12 @@ allTests(const Ice::CommunicatorPtr& comm)
server->id = "Server";
server->exe = comm->getProperties()->getProperty("TestDir") + "/server";
server->pwd = ".";
+ addProperty(server, "Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
server->activation = "on-demand";
AdapterDescriptor adapter;
adapter.name = "TestAdapter";
adapter.id = "TestAdapter.Server";
- adapter.registerProcess = true;
+ adapter.registerProcess = false;
PropertyDescriptor property;
property.name = "TestAdapter.Endpoints";
property.value = "default";
@@ -1170,10 +1181,20 @@ allTests(const Ice::CommunicatorPtr& comm)
}
cout << "ok" << endl;
+
+ cout << "Shutting down Node1... " << flush;
slave1Admin->shutdownNode("Node1");
+ cout << "ok" << endl;
+
+ cout << "Removing Node1 server... " << flush;
removeServer(admin, "Node1");
+ cout << "ok" << endl;
+ cout << "Removing Slave2 server..." << flush;
removeServer(admin, "Slave2");
+ cout << "ok" << endl;
+
+
slave1Admin->shutdown();
removeServer(admin, "Slave1");
masterAdmin->shutdown();
diff --git a/cpp/test/IceGrid/replication/application.xml b/cpp/test/IceGrid/replication/application.xml
index abcf5d4e1d4..c7647125629 100644
--- a/cpp/test/IceGrid/replication/application.xml
+++ b/cpp/test/IceGrid/replication/application.xml
@@ -17,6 +17,7 @@
<property name="IceGrid.Node.Trace.Replica" value="0"/>
<property name="IceGrid.Node.Trace.Adapter" value="0"/>
<property name="Ice.Trace.Network" value="0"/>
+ <property name="Ice.Admin.Endpoints" value=""/>
</server>
</server-template>
@@ -48,6 +49,7 @@
<property name="Ice.Trace.Network" value="0"/>
<property name="IceGrid.Registry.Trace.Locator" value="0"/>
<property name="IceGrid.Registry.UserAccounts" value="${test.dir}/useraccounts.txt"/>
+ <property name="Ice.Admin.Endpoints" value=""/>
</server>
</server-template>
diff --git a/cpp/test/IceGrid/session/AllTests.cpp b/cpp/test/IceGrid/session/AllTests.cpp
index 3237e10f604..e2de7561ffd 100644
--- a/cpp/test/IceGrid/session/AllTests.cpp
+++ b/cpp/test/IceGrid/session/AllTests.cpp
@@ -1777,12 +1777,14 @@ allTests(const Ice::CommunicatorPtr& communicator)
AdapterDescriptor adapter;
adapter.name = "IceGrid.Node";
adapter.id = "IceGrid.Node.node-1";
- adapter.registerProcess = true;
+ adapter.registerProcess = true; // just to tell the node to expect a Process (supplied by node-1)
adapter.serverLifetime = false;
server->adapters.push_back(adapter);
addProperty(server, "IceGrid.Node.Name", "node-1");
addProperty(server, "IceGrid.Node.Data", properties->getProperty("TestDir") + "/db/node-1");
addProperty(server, "IceGrid.Node.Endpoints", "default");
+ // addProperty(server, "Ice.Admin.Endpoints", "tcp -h 127.0.0.1"); // registering two processes doesn't work for some reason
+
NodeDescriptor node;
node.servers.push_back(server);
nodeApp.nodes["localnode"] = node;
@@ -1829,10 +1831,11 @@ allTests(const Ice::CommunicatorPtr& communicator)
server->pwd = ".";
adapter.name = "Server";
adapter.id = "ServerAdapter";
- adapter.registerProcess = true;
+ adapter.registerProcess = false;
adapter.serverLifetime = true;
server->adapters.push_back(adapter);
addProperty(server, "Server.Endpoints", "default");
+ addProperty(server, "Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
node = NodeDescriptor();
node.servers.push_back(server);
testApp.nodes["localnode"] = node;
diff --git a/cpp/test/IceGrid/session/application.xml b/cpp/test/IceGrid/session/application.xml
index ddc726028a2..119151cc9ee 100644
--- a/cpp/test/IceGrid/session/application.xml
+++ b/cpp/test/IceGrid/session/application.xml
@@ -13,8 +13,7 @@
<property name="Glacier2.Client.Endpoints" value="${endpoints}"/>
<property name="Glacier2.Server.Endpoints" value="tcp -h 127.0.0.1"/>
<property name="Glacier2.Admin.Endpoints" value="tcp -h 127.0.0.1"/>
- <property name="Glacier2.Admin.RegisterProcess" value="1"/>
-
+
<property name="Glacier2.SessionManager" value="${manager}"/>
<property name="Glacier2.SSLSessionManager" value="${ssl-manager}"/>
<property name="Glacier2.PermissionsVerifier" value="${verifier}"/>
@@ -37,7 +36,7 @@
ssl-manager="IceGrid/AdminSSLSessionManager"/>
<server id="PermissionsVerifierServer" exe="${test.dir}/server" activation="on-demand">
- <adapter name="Server" register-process="true" endpoints="default -h 127.0.0.1">
+ <adapter name="Server" endpoints="default -h 127.0.0.1">
<object identity="ClientPermissionsVerifier"/>
<object identity="SSLPermissionsVerifier"/>
</adapter>
diff --git a/cpp/test/IceGrid/simple/simple_server.xml b/cpp/test/IceGrid/simple/simple_server.xml
index 755fb871c77..e2dacca9b46 100644
--- a/cpp/test/IceGrid/simple/simple_server.xml
+++ b/cpp/test/IceGrid/simple/simple_server.xml
@@ -3,7 +3,7 @@
<node name="localnode">
<server id="server" exe="${test.dir}/server" activation="on-demand">
- <adapter name="TestAdapter" endpoints="default" register-process="true" id="TestAdapter">
+ <adapter name="TestAdapter" endpoints="default" id="TestAdapter">
<object identity="test" type="Test"/>
</adapter>
diff --git a/cpp/test/IceGrid/update/AllTests.cpp b/cpp/test/IceGrid/update/AllTests.cpp
index 899d00d1247..fc0cf9e4644 100644
--- a/cpp/test/IceGrid/update/AllTests.cpp
+++ b/cpp/test/IceGrid/update/AllTests.cpp
@@ -148,10 +148,11 @@ allTests(const Ice::CommunicatorPtr& communicator)
server->id = "Server";
server->exe = properties->getProperty("TestDir") + "/server";
server->pwd = ".";
+ addProperty(server, "Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
AdapterDescriptor adapter;
adapter.name = "Server";
adapter.id = "ServerAdapter";
- adapter.registerProcess = true;
+ adapter.registerProcess = false;
addProperty(server, "Server.Endpoints", "default");
ObjectDescriptor object;
object.id = communicator->stringToIdentity("test");
@@ -211,10 +212,11 @@ allTests(const Ice::CommunicatorPtr& communicator)
server->id = "${name}";
server->exe = "${test.dir}/server";
server->pwd = ".";
+ addProperty(server, "Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
adapter = AdapterDescriptor();
adapter.name = "Server";
adapter.id = "${server}";
- adapter.registerProcess = true;
+ adapter.registerProcess = false;
addProperty(server, "Server.Endpoints", "default");
object = ObjectDescriptor();
object.id = communicator->stringToIdentity("${server}");
@@ -588,13 +590,14 @@ allTests(const Ice::CommunicatorPtr& communicator)
AdapterDescriptor adapter;
adapter.name = "${service}";
adapter.id = "${server}.${service}";
- adapter.registerProcess = true;
+ adapter.registerProcess = false;
addProperty(service, "${service}.Endpoints", "default");
service->adapters.push_back(adapter);
IceBoxDescriptorPtr server = new IceBoxDescriptor();
server->id = "IceBox";
server->exe = properties->getProperty("IceDir") + "/bin/icebox";
+ addProperty(server, "Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
server->services.resize(3);
server->services[0].descriptor = ServiceDescriptorPtr::dynamicCast(service->ice_clone());
service->name = "Service2";
@@ -1147,6 +1150,8 @@ allTests(const Ice::CommunicatorPtr& communicator)
addProperty(server, "IceGrid.Node.Data", properties->getProperty("TestDir") + "/db/node-${index}");
addProperty(server, "IceGrid.Node.Endpoints", "default");
addProperty(server, "IceGrid.Node.PropertiesOverride", properties->getProperty("NodePropertiesOverride"));
+
+
nodeApp.serverTemplates["nodeTemplate"].descriptor = server;
nodeApp.serverTemplates["nodeTemplate"].parameters.push_back("index");
@@ -1201,9 +1206,10 @@ allTests(const Ice::CommunicatorPtr& communicator)
server->id = "Server";
server->exe = properties->getProperty("TestDir") + "/server";
server->pwd = ".";
+ addProperty(server, "Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
adapter.name = "Server";
adapter.id = "ServerAdapter";
- adapter.registerProcess = true;
+ adapter.registerProcess = false;
adapter.serverLifetime = true;
server->adapters.push_back(adapter);
addProperty(server, "Server.Endpoints", "default");
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 13:35:00 +0000