[Rt-commit] rt branch, 4.0-trunk, updated. rt-4.0.8-198-gd10751b

[Thomas Sibley]

The branch, 4.0-trunk has been updated
       via  d10751b790a489583a37c9579724ed11f18ad08f (commit)
       via  0f3d6b4afa982f35ca444c6417b8223c92a87096 (commit)
       via  ea553805004e2fe114778029939aaf2d2c4670d5 (commit)
      from  e301feebe9d664d07a0e00295f7c6ae1de9da2ee (commit)

Summary of changes:
 lib/RT/Test.pm | 5 +++++
 1 file changed, 5 insertions(+)

- Log -----------------------------------------------------------------
commit d10751b790a489583a37c9579724ed11f18ad08f
Merge: e301fee 0f3d6b4
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Fri Nov 30 13:29:04 2012 -0800

    Merge branch '4.0/make-date-tests-locale-independent' into 4.0-trunk
    
    Conflicts:
    	lib/RT/Test.pm
            BEGIN block removed on 4.0-trunk already

diff --cc lib/RT/Test.pm
index 36f0f87,27af608..e3fef14
--- a/lib/RT/Test.pm
+++ b/lib/RT/Test.pm
@@@ -91,9 -93,30 +91,14 @@@ problem in Perl that hides the top-leve
  
  =cut
  
 -sub generate_port {
 -    my $self = shift;
 -    my $port = 1024 + int rand(10000) + $$ % 1024;
 -
 -    my $paddr = sockaddr_in( $port, inet_aton('localhost') );
 -    socket( SOCK, PF_INET, SOCK_STREAM, getprotobyname('tcp') )
 -      or die "socket: $!";
 -    if ( connect( SOCK, $paddr ) ) {
 -        close(SOCK);
 -        return generate_port();
 -    }
 -    close(SOCK);
 -
 -    return $port;
 -}
 +our $port;
 +our @SERVERS;
  
+ BEGIN {
 -    $port   = generate_port();
 -    $dbname = $ENV{RT_TEST_PARALLEL}? "rt4test_$port" : "rt4test";
 -
+     delete $ENV{$_} for qw/LANGUAGE LC_ALL LC_MESSAGES LANG/;
+     $ENV{LANG} = "C";
+ };
+ 
  sub import {
      my $class = shift;
      my %args = %rttest_opt = @_;

-----------------------------------------------------------------------