diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2014-06-16 16:32:45 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2014-06-16 16:32:45 +0000 |
| commit | fcd78c20eae613ad3857d3d8529c94db1d8288c4 (patch) | |
| tree | 04b048cdc27091d481c4bb3f0ccb5f1a4a712b87 | |
| parent | 148c578085a1d96f3a067caa419fb2b399b919c6 (diff) | |
| download | ATCD-fcd78c20eae613ad3857d3d8529c94db1d8288c4.tar.gz | |
Mon Jun 16 16:30:40 UTC 2014 Phil Mesnier <mesnier_p@ociweb.com>
* orbsvcs/tests/ImplRepo/servers_list/run_test_ft.pl:
One more windows fix. A delay is required after killing primary
locator to avoid comm failures.
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rwxr-xr-x | TAO/orbsvcs/tests/ImplRepo/servers_list/run_test_ft.pl | 14 |
2 files changed, 17 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 3a66fe4c6f3..22e4f3ec31d 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Mon Jun 16 16:30:40 UTC 2014 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/tests/ImplRepo/servers_list/run_test_ft.pl: + One more windows fix. A delay is required after killing primary + locator to avoid comm failures. + Fri Jun 13 21:19:05 UTC 2014 Phil Mesnier <mesnier_p@ociweb.com> * orbsvcs/tests/ImplRepo/servers_list/run_test_ft.pl: diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_list/run_test_ft.pl b/TAO/orbsvcs/tests/ImplRepo/servers_list/run_test_ft.pl index bb0c84f8630..f99e68c7a0c 100755 --- a/TAO/orbsvcs/tests/ImplRepo/servers_list/run_test_ft.pl +++ b/TAO/orbsvcs/tests/ImplRepo/servers_list/run_test_ft.pl @@ -311,11 +311,12 @@ sub list_active_servers $TI->Arguments ("$ti_initref list $list_options"); # Redirect output so we can count number of lines in output redirect_output(); - $result = $TI->SpawnWaitKill ($ti->ProcessStartWaitInterval()); + $TI_status = $TI->SpawnWaitKill ($ti->ProcessStartWaitInterval()); my $list_time = time() - $start_time; restore_output(); if ($TI_status != 0) { - return kill_imr ("tao_imr list returned $TI_status"); + kill_imr ("tao_imr list returned $TI_status"); + return -1; } open (FILE, $stderr_file) or die "Can't open $stderr_file: $!"; $active_servers = 0; @@ -356,12 +357,19 @@ sub servers_list_test print "\nList of active servers from primary\n"; $active_servers_before_kill = list_active_servers("-a"); - + if ($active_servers_before_kill < 0) { + return 1; + } print "\nKilling primary IMR Locator\n"; $IMR->Kill (); $IMR->TimedWait (1); + sleep (2); print "\nList of active servers from backup\n"; $active_servers_after_kill = list_active_servers("-a"); + if ($active_servers_after_kill < 0) { + return 1; + } + if ($active_servers_after_kill != $active_servers_before_kill) { print STDERR "ERROR: Excepted list of active servers after killing ". |