fixed timeout test

mojolicious · Feb 25, 2012 · 153f79b · 153f79b
1 parent c737802
commit 153f79b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/lib/Mojo/UserAgent.pm b/lib/Mojo/UserAgent.pm
@@ -15,7 +15,7 @@ use constant DEBUG => $ENV{MOJO_USERAGENT_DEBUG} || 0;
 # "You can't let a single bad experience scare you away from drugs."
 has ca              => sub { $ENV{MOJO_CA_FILE} };
 has cert            => sub { $ENV{MOJO_CERT_FILE} };
-has connect_timeout => sub { $ENV{MOJO_CONNECT_TIMEOUT} // 10 };
+has connect_timeout => sub { $ENV{MOJO_CONNECT_TIMEOUT} || 10 };
 has cookie_jar      => sub { Mojo::CookieJar->new };
 has [qw/http_proxy https_proxy local_address no_proxy/];
 has inactivity_timeout => sub { $ENV{MOJO_INACTIVITY_TIMEOUT} // 20 };

diff --git a/t/mojo/user_agent.t b/t/mojo/user_agent.t
@@ -6,7 +6,7 @@ BEGIN {
   $ENV{MOJO_IOWATCHER} = 'Mojo::IOWatcher';
 }
 
-use Test::More tests => 86;
+use Test::More tests => 85;
 
 # "The strong must protect the sweet."
 use Mojo::IOLoop;
@@ -88,9 +88,7 @@ get '/echo' => sub {
 {
   is(Mojo::UserAgent->new->connect_timeout, 10, 'right value');
   local $ENV{MOJO_CONNECT_TIMEOUT} = 25;
-  is(Mojo::UserAgent->new->connect_timeout, 25, 'right value');
-  $ENV{MOJO_CONNECT_TIMEOUT} = 0;
-  is(Mojo::UserAgent->new->connect_timeout,    0,  'right value');
+  is(Mojo::UserAgent->new->connect_timeout,    25, 'right value');
   is(Mojo::UserAgent->new->inactivity_timeout, 20, 'right value');
   local $ENV{MOJO_INACTIVITY_TIMEOUT} = 25;
   is(Mojo::UserAgent->new->inactivity_timeout, 25, 'right value');