diff options
Diffstat (limited to 'cpp/test')
| -rw-r--r-- | cpp/test/IceGrid/replicaGroup/application.xml | 10 | ||||
| -rw-r--r-- | cpp/test/IceUtil/timer/Client.cpp | 10 |
2 files changed, 14 insertions, 6 deletions
diff --git a/cpp/test/IceGrid/replicaGroup/application.xml b/cpp/test/IceGrid/replicaGroup/application.xml index ab33d88b2f1..1c7883d0601 100644 --- a/cpp/test/IceGrid/replicaGroup/application.xml +++ b/cpp/test/IceGrid/replicaGroup/application.xml @@ -52,7 +52,7 @@ <parameter name="priority"/> <service name="${name}" entry="TestService:create"> <adapter name="${service}" endpoints="default" - replica-group="${replicaGroup}" priority="${priority}" server-lifetime="false"> + replica-group="${replicaGroup}" priority="${priority}" server-lifetime="false"> <object identity="${service}"/> </adapter> <property name="Identity" value="${replicaGroup}"/> @@ -66,6 +66,14 @@ <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"/> + + <!-- Dummy service with server lifetime adapter to ensure all + the services are started when the server is marked as + Active --> + <service name="Dummy" entry="TestService:create"> + <adapter name="${service}" endpoints="default" server-lifetime="true"/> + <property name="Identity" value="dummy"/> + </service> </icebox> </server-template> diff --git a/cpp/test/IceUtil/timer/Client.cpp b/cpp/test/IceUtil/timer/Client.cpp index 7821b71699a..04e7ff64b58 100644 --- a/cpp/test/IceUtil/timer/Client.cpp +++ b/cpp/test/IceUtil/timer/Client.cpp @@ -99,14 +99,14 @@ int main(int argc, char* argv[]) { TestTaskPtr task = new TestTask(); - timer->schedule(task, IceUtil::Time::now(IceUtil::Time::Monotonic)); + timer->schedule(task, IceUtil::Time()); task->waitForRun(); while(true) { - timer->schedule(task, IceUtil::Time::now(IceUtil::Time::Monotonic)); + timer->schedule(task, IceUtil::Time::milliSeconds(-10)); try { - timer->schedule(task, IceUtil::Time::now(IceUtil::Time::Monotonic)); + timer->schedule(task, IceUtil::Time()); test(task->hasRun()); } catch(const IceUtil::IllegalArgumentException&) @@ -120,7 +120,7 @@ int main(int argc, char* argv[]) { TestTaskPtr task = new TestTask(); test(!timer->cancel(task)); - timer->schedule(task, IceUtil::Time::now(IceUtil::Time::Monotonic) + IceUtil::Time::seconds(1)); + timer->schedule(task, IceUtil::Time::seconds(1)); test(!task->hasRun() && timer->cancel(task) && !task->hasRun()); test(!timer->cancel(task)); IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(1100)); @@ -132,7 +132,7 @@ int main(int argc, char* argv[]) IceUtil::Time start = IceUtil::Time::now(IceUtil::Time::Monotonic) + IceUtil::Time::milliSeconds(100); for(int i = 0; i < 100; ++i) { - tasks.push_back(new TestTask(start + IceUtil::Time::milliSeconds(i))); + tasks.push_back(new TestTask(IceUtil::Time::milliSeconds(100 + i))); } random_shuffle(tasks.begin(), tasks.end()); |