diff options
| author | boris <boris@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-01-21 16:37:58 +0000 |
|---|---|---|
| committer | boris <boris@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-01-21 16:37:58 +0000 |
| commit | eaabe01a21cb3f6c150595608204528b9e0ef0da (patch) | |
| tree | a5ed9feed9861c1aa45d022f707ee4f4da9eaaab | |
| parent | 72f3e1f76e7cdc53bb4ef2a4a24938cf269d7eb1 (diff) | |
| download | ATCD-eaabe01a21cb3f6c150595608204528b9e0ef0da.tar.gz | |
ChangeLogTag: Tue Jan 21 10:38:48 2003 Boris S Kolpackov <boris@isis-server.isis.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 5 | ||||
| -rwxr-xr-x | TAO/orbsvcs/tests/Security/Crash_Test/run_test.pl | 23 |
2 files changed, 19 insertions, 9 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 117316e1bad..c708c74ac44 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Tue Jan 21 10:38:48 2003 Boris S Kolpackov <boris@isis-server.isis.vanderbilt.edu> + + * orbsvcs/tests/Security/Crash_Test/run_test.pl: fixed few + race conditions. + Mon Jan 20 18:46:17 2003 Nanbor Wang <nanbor@cs.wustl.edu> * orbsvcs/ImplRepo_Service/README.txt (ImplRepoService): Fixed diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/run_test.pl b/TAO/orbsvcs/tests/Security/Crash_Test/run_test.pl index 97abdbb5bab..152e96d46fa 100755 --- a/TAO/orbsvcs/tests/Security/Crash_Test/run_test.pl +++ b/TAO/orbsvcs/tests/Security/Crash_Test/run_test.pl @@ -16,7 +16,10 @@ unlink $iorfile; $server_conf = PerlACE::LocalFile ("server$PerlACE::svcconf_ext"); $client_conf = PerlACE::LocalFile ("client$PerlACE::svcconf_ext"); -$client_args = "-ORBSvcConf $client_conf -w 15 -k file://$iorfile"; +$server_startup_wait_time = 5; +$client_wait_time = 15; + +$client_args = "-ORBSvcConf $client_conf -w $client_wait_time -k file://$iorfile"; # Set the SSL environment $ENV{'SSL_CERT_FILE'} = 'cacert.pem'; @@ -33,7 +36,7 @@ $CL3 = new PerlACE::Process ("client", "$client_args"); local $start_time = time(); -local $max_running_time = 300; # 5 minutes +local $max_running_time = 500; # < 10 minutes local $elapsed = time() - $start_time; while($status == 0 && $elapsed < $max_running_time) @@ -41,7 +44,7 @@ while($status == 0 && $elapsed < $max_running_time) # Start the server $SV->Spawn (); - if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) + if (PerlACE::waitforfile_timed ($iorfile, $server_startup_wait_time) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; $SV->Kill (); $SV->TimedWait (1); @@ -54,14 +57,15 @@ while($status == 0 && $elapsed < $max_running_time) $CL3->Spawn (); # Let our clients to execute few requests - sleep (1); + sleep (3); # Now kill the server and start it again. $SV->Kill (); $SV->TimedWait (5); + $SV->Spawn (); - if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) + if (PerlACE::waitforfile_timed ($iorfile, $server_startup_wait_time) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; $SV->Kill (); $SV->TimedWait (1); @@ -70,10 +74,11 @@ while($status == 0 && $elapsed < $max_running_time) # Wait for the server and clients to finish - $client1 = $CL1->WaitKill (10); - $client2 = $CL2->WaitKill (10); - $client3 = $CL3->WaitKill (10); - $server = $SV->WaitKill (10); + # Waiting for the first client longer because it waits for others and shutdowns the server. + $client1 = $CL1->WaitKill ($client_wait_time * 2); + $client2 = $CL2->WaitKill ($client_wait_time * 2); + $client3 = $CL3->WaitKill ($client_wait_time * 2); + $server = $SV->WaitKill (5); # should be down already if ($client1) { |