summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/tests/LoadBalancing
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2010-09-17 08:35:56 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2010-09-17 08:35:56 +0000
commitbdd31e4d7374fb4f1cbb745021e90dd9f2e8e6d2 (patch)
tree24d08fa33165c20198fe9658efe3bda6fbe292ac /TAO/orbsvcs/tests/LoadBalancing
parente8cc76aad5f556c77963836aacfe813876795059 (diff)
downloadATCD-bdd31e4d7374fb4f1cbb745021e90dd9f2e8e6d2.tar.gz
Removed trailing whitespaces
Diffstat (limited to 'TAO/orbsvcs/tests/LoadBalancing')
-rwxr-xr-xTAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/run_test.pl28
-rwxr-xr-xTAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/run_test.pl12
2 files changed, 20 insertions, 20 deletions
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/run_test.pl b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/run_test.pl
index 3b495f39dfa..35105f557c1 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/run_test.pl
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/run_test.pl
@@ -24,28 +24,28 @@ $init_ref = "-ORBInitRef LoadManager=file://$ior1file";
@tests =
- ( {
+ ( {
description => "Dead Member Detection",
strategy => "RoundRobin",
svr1_args => "$init_ref -n 1 -o $ior2file",
svr2_args => "$init_ref -n 2 -k file://$ior2file -j $ior3file",
svr3_args => "$init_ref -n 3 -k file://$ior2file",
client_args => "-k file://$ior2file -j file://$ior3file -s RoundRobin",
- }, {
+ }, {
description => "Hang Member Detection",
strategy => "RoundRobin",
svr1_args => "$init_ref -n 1 -o $ior2file",
svr2_args => "$init_ref -n 2 -k file://$ior2file -j $ior3file -l 2",
svr3_args => "$init_ref -n 3 -k file://$ior2file",
client_args => "-k file://$ior2file -j file://$ior3file -s RoundRobin -l",
- }, {
+ }, {
description => "Dead Member Detection",
strategy => "Random",
svr1_args => "$init_ref -n 1 -o $ior2file",
svr2_args => "$init_ref -n 2 -k file://$ior2file -j $ior3file",
svr3_args => "$init_ref -n 3 -k file://$ior2file",
client_args => "-k file://$ior2file -j file://$ior3file -s Random",
- }, {
+ }, {
description => "Hang Member Detection",
strategy => "Random",
svr1_args => "$init_ref -n 1 -o $ior2file",
@@ -75,21 +75,21 @@ for $test (@tests) {
$server2->DeleteFile($ior3file);
$status = 0;
- #-ORBVerboseLogging 1 -ORBDebugLevel 10 -ORBLogFile lm.log
+ #-ORBVerboseLogging 1 -ORBDebugLevel 10 -ORBLogFile lm.log
$LM = $server1->CreateProcess ("../../../../LoadBalancer/LoadManager",
- "-ORBVerboseLogging 1 -ORBDebugLevel $debug -s $test->{strategy} -o $ior1file -i 3"
+ "-ORBVerboseLogging 1 -ORBDebugLevel $debug -s $test->{strategy} -o $ior1file -i 3"
. " -ORBSvcConf $lm_conf");
$SV1 = $server2->CreateProcess ("server", $test->{svr1_args});
$SV2 = $server3->CreateProcess ("server", $test->{svr2_args});
$SV3 = $server4->CreateProcess ("server", $test->{svr3_args});
$CL = $client->CreateProcess ("client", $test->{client_args});
-
+
print STDERR "\n\n======== $test->{description} with $test->{strategy} ================\n";
print STDERR "\n";
print STDERR "== Start Load Banlancer.\n";
print STDERR $LM->CommandLine () . "\n";
-
+
$LM->Spawn ();
if ($server1->WaitForFileTimed ($ior1file, $server1->ProcessStartWaitInterval()) == -1) {
@@ -97,13 +97,13 @@ for $test (@tests) {
$LM->Kill (); $LM->TimedWait (1);
exit 1;
}
-
+
if ($server1->GetFile ($ior1file) == -1) {
print STDERR "ERROR: cannot retrieve file <$server1_ior1file>\n";
$LM->Kill (); $LM->TimedWait (1);
exit 1;
}
-
+
if ($server2->PutFile ($ior2file) == -1) {
print STDERR "ERROR: cannot set file <$server2_ior2file>\n";
$LM->Kill (); $LM->TimedWait (1);
@@ -120,7 +120,7 @@ for $test (@tests) {
$SV1->Kill (); $SV1->TimedWait (1);
exit 1;
}
-
+
if ($server2->GetFile ($ior2file) == -1) {
print STDERR "ERROR: cannot retrieve file <$server2_ior2file>\n";
$LM->Kill ();
@@ -147,7 +147,7 @@ for $test (@tests) {
$SV2->Kill (); $SV2->TimedWait (1);
exit 1;
}
-
+
if ($server3->GetFile ($ior3file) == -1) {
print STDERR "ERROR: cannot retrieve file <$server3_ior1file>\n";
$LM->Kill ();
@@ -173,7 +173,7 @@ for $test (@tests) {
$status = 1;
}
- $server = $SV3->WaitKill ($server2->ProcessStopWaitInterval());
+ $server = $SV3->WaitKill ($server2->ProcessStopWaitInterval());
if ($server != 0) {
print STDERR "ERROR: server 3 returned $server\n";
@@ -203,7 +203,7 @@ for $test (@tests) {
$server1->DeleteFile($ior1file);
$server2->DeleteFile($ior2file);
$server3->DeleteFile($ior3file);
-
+
if ($status == 0) {
print STDERR "$description test passed.\n";
}
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/run_test.pl b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/run_test.pl
index 323d1de9d0e..b9f1f6ef6b6 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/run_test.pl
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/run_test.pl
@@ -27,7 +27,7 @@ $lm_conf = $^O eq 'MSWin32' ? "windows$PerlACE::svcconf_ext"
$init_ref = "-ORBInitRef LoadManager=file://$ior1file";
-@tests = ({
+@tests = ({
description => "Dead Member Detection",
strategy => "RoundRobin",
svr_args => "$init_ref -o $ior2file -x file://$ior3file -y file://$ior4file -z file://$ior5file",
@@ -35,7 +35,7 @@ $init_ref = "-ORBInitRef LoadManager=file://$ior1file";
svr2_args => "$init_ref -n 2 -o $ior4file -j $ior6file",
svr3_args => "$init_ref -n 3 -o $ior5file",
client_args => "-k file://$ior2file -j file://$ior6file -s RoundRobin",
- },{
+ },{
description => "Hang Member Detection",
strategy => "RoundRobin",
svr_args => "$init_ref -o $ior2file -x file://$ior3file -y file://$ior4file -z file://$ior5file",
@@ -43,7 +43,7 @@ $init_ref = "-ORBInitRef LoadManager=file://$ior1file";
svr2_args => "$init_ref -n 2 -o $ior4file -j $ior6file -l 2",
svr3_args => "$init_ref -n 3 -o $ior5file",
client_args => "-k file://$ior2file -j file://$ior6file -s RoundRobin -l",
- },{
+ },{
description => "Dead Member Detection",
strategy => "Random",
svr_args => "$init_ref -o $ior2file -x file://$ior3file -y file://$ior4file -z file://$ior5file",
@@ -51,7 +51,7 @@ $init_ref = "-ORBInitRef LoadManager=file://$ior1file";
svr2_args => "$init_ref -n 2 -o $ior4file -j $ior6file",
svr3_args => "$init_ref -n 3 -o $ior5file",
client_args => "-k file://$ior2file -j file://$ior6file -s Random",
- },{
+ },{
description => "Hang Member Detection",
strategy => "Random",
svr_args => "$init_ref -o $ior2file -x file://$ior3file -y file://$ior4file -z file://$ior5file",
@@ -88,9 +88,9 @@ for $test (@tests) {
$server5->DeleteFile($ior5file);
$status = 0;
- #-ORBVerboseLogging 1 -ORBDebugLevel 10 -ORBLogFile lm.log
+ #-ORBVerboseLogging 1 -ORBDebugLevel 10 -ORBLogFile lm.log
$LM = $server1->CreateProcess ("../../../../LoadBalancer/LoadManager",
- "-ORBVerboseLogging 1 -ORBDebugLevel $debug -s $test->{strategy} -o $ior1file -i 3"
+ "-ORBVerboseLogging 1 -ORBDebugLevel $debug -s $test->{strategy} -o $ior1file -i 3"
. " -ORBSvcConf $lm_conf");
$SV = $server2->CreateProcess ("server", $test->{svr_args});
$SV1 = $server3->CreateProcess ("factory_server", $test->{svr1_args});