summaryrefslogtreecommitdiff
path: root/cpp/test/IceGrid/distribution/AllTests.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2016-02-26 20:46:27 +0100
committerJose <jose@zeroc.com>2016-02-26 20:46:27 +0100
commit62cba8cd46a535585a4422daab489f114feab6f3 (patch)
treec77e9cec24a570b06024a3c6a1552b8e6eb20ec6 /cpp/test/IceGrid/distribution/AllTests.cpp
parentupdating changelog for ICE-6844 (diff)
downloadice-62cba8cd46a535585a4422daab489f114feab6f3.tar.bz2
ice-62cba8cd46a535585a4422daab489f114feab6f3.tar.xz
ice-62cba8cd46a535585a4422daab489f114feab6f3.zip
Windows msbuild build updates
Diffstat (limited to 'cpp/test/IceGrid/distribution/AllTests.cpp')
-rw-r--r--cpp/test/IceGrid/distribution/AllTests.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/cpp/test/IceGrid/distribution/AllTests.cpp b/cpp/test/IceGrid/distribution/AllTests.cpp
index 21b56503339..b5b611fbfb3 100644
--- a/cpp/test/IceGrid/distribution/AllTests.cpp
+++ b/cpp/test/IceGrid/distribution/AllTests.cpp
@@ -19,7 +19,7 @@ using namespace std;
using namespace Test;
using namespace IceGrid;
-void
+void
allTests(const Ice::CommunicatorPtr& communicator)
{
IceGrid::RegistryPrx registry = IceGrid::RegistryPrx::checkedCast(
@@ -31,7 +31,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
AdminPrx admin = session->getAdmin();
test(admin);
-
+
cout << "testing distributions... " << flush;
{
admin->startServer("Test.IcePatch2");
@@ -125,7 +125,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
update.name = "Test";
update.variables["icepatch.directory"] = "${test.dir}/data/updated";
admin->updateApplication(update);
-
+
admin->startServer("Test.IcePatch2");
admin->startServer("IcePatch2-Direct");
@@ -142,7 +142,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
copy(ex.reasons.begin(), ex.reasons.end(), ostream_iterator<string>(cerr, "\n"));
test(false);
}
-
+
test(test->getServerFile("rootfile") == "rootfile-updated!");
test(test->getServerFile("dir1/file1") == "");
test(test->getServerFile("dir1/file2") == "dummy-file2-updated!");
@@ -211,11 +211,11 @@ allTests(const Ice::CommunicatorPtr& communicator)
{
ApplicationDescriptor app = admin->getApplicationInfo("Test").descriptor;
admin->removeApplication("Test");
-
+
app.variables["icepatch.directory"] = "${test.dir}/data/original";
test(app.nodes["localnode"].servers[2]->id == "server-dir1");
app.nodes["localnode"].servers[2]->applicationDistrib = false;
-
+
admin->addApplication(app);
admin->startServer("Test.IcePatch2");
@@ -246,7 +246,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
admin->addApplication(app);
admin->startServer("Test.IcePatch2");
admin->startServer("IcePatch2-Direct");
-
+
try
{
admin->patchApplication("Test", true);
@@ -276,7 +276,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
admin->addApplication(app);
admin->startServer("Test.IcePatch2");
admin->startServer("IcePatch2-Direct");
-
+
try
{
admin->patchServer("server-dir1", true);